.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c01197450626df77eabbef33db05a59f93552777..4586b763e98e823f93beb3a12827488356cc3845 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,18 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/global.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/global.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/salon.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/salon.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/denon.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/denon.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/domoticz_device_event.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/domoticz_device_event.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/lib/denon.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/denon.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/domoticz.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/domoticz.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/lib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/lib.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/off.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/off.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/proc.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/proc.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/lib/shield.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/shield.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/shield.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/shield.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/servers/logcat.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/logcat.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -964,14 +955,8 @@
       <workItem from="1612099867183" duration="8228000" />
       <workItem from="1612347206766" duration="685000" />
       <workItem from="1612620373278" duration="26000" />
-      <workItem from="1612620424202" duration="11592000" />
-    </task>
-    <task id="LOCAL-00398" summary=".">
-      <created>1605436590375</created>
-      <option name="number" value="00398" />
-      <option name="presentableId" value="LOCAL-00398" />
-      <option name="project" value="LOCAL" />
-      <updated>1605436590375</updated>
+      <workItem from="1612620424202" duration="11603000" />
+      <workItem from="1612640974349" duration="807000" />
     </task>
     <task id="LOCAL-00399" summary=".">
       <created>1605437322205</created>
@@ -1309,7 +1294,14 @@
       <option name="project" value="LOCAL" />
       <updated>1612199517377</updated>
     </task>
-    <option name="localTasksCounter" value="447" />
+    <task id="LOCAL-00447" summary=".">
+      <created>1612640061389</created>
+      <option name="number" value="00447" />
+      <option name="presentableId" value="LOCAL-00447" />
+      <option name="project" value="LOCAL" />
+      <updated>1612640061390</updated>
+    </task>
+    <option name="localTasksCounter" value="448" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/lib/denon.php b/scripts/lib/denon.php
index b9c03d85ab428733e72320bd66d607b9570928c6..14b768ea1e803045722dd59163eb86e4d6fbd9b8 100644 (file)
--- a/scripts/lib/denon.php
+++ b/scripts/lib/denon.php
@@ -41,7 +41,7 @@ function denonAVROn($input = 'Media Player')
 function denonAVRInput($input)
 {
     $map = ['Media Player' => 5, 'CD' => 9, 'HEOS Music' => 13];
-    $volumes = ['Media Player' => 40, 'HEOS Music' => 50, 'CD' => 30];
+    $volumes = ['Media Player' => 59, 'HEOS Music' => 50, 'CD' => 30];
     if (isset($map[$input])) {
         _denonAVR('set_config?type=7&data=' . rawurlencode('<Source zone="1" index="' . $map[$input] . '"></Source>'));
         sleep(1);
@@ -49,6 +49,7 @@ function denonAVRInput($input)
     if (isset($volumes[$input])) {
         denonAVRVolume($volumes[$input]);
         sleep(1);
+        denonAVRVolume(1, '+');
     }
 }
 

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index faf119f03d6020126568f0c7e223b80f0277a148..6f0e96f6d8d68075eae2b4d7618d1164926a97fc 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -308,7 +308,7 @@ $scenes = [
     ],
     'home/alert' => [
         ['type' => 'domoticz', 'device' => '392', 'command' => true, 'priority' => true],
-        ['type' => 'hue', 'group' => $alert, 'scene' => ['alert' => 'select']],
+        ['type' => 'hue', 'group' => $alert, 'scene' => ['alert' => 'lselect']],
         ['type' => 'phonetask', 'phone' => 'vincent', 'task' => 'Tortuga Alerte'],
         ['type' => 'hue', 'group' => $alert, 'delay' => 1, 'scene' => ['alert' => 'none']],
     ],

diff --git a/scripts/lib/shield.php b/scripts/lib/shield.php
index b69a7c0011a9dacc8027ca12d76973ea9a96ddf3..636d93fcf99096e44c939f92ad3d5807016da573 100644 (file)
--- a/scripts/lib/shield.php
+++ b/scripts/lib/shield.php
@@ -42,6 +42,7 @@ function shieldRunActivity($device = null)
         stopPlayersIn('salon', true, false);
         epson(true);
         denonAVROn();
+        execScene('salon/cinema');
     } else if ($device['id'] === 'bureau' || $device['id'] === 'bureausun') {
         stopPlayersIn('bureau', true, false);
         if ($onlySound) {