.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index aa442fa0eb6b48c33e0b8ddc06c6a16ca5d19e6c..b70ffe44d281af27b476cbe4c3f1ded19d367059 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +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$/scripts/lib/off.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/off.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/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.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" />
@@ -273,17 +275,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration default="true" type="ArquillianTestNG" factoryName="">
       <option name="arquillianRunConfiguration">
         <value>
@@ -975,14 +966,8 @@
       <workItem from="1612981789538" duration="2761000" />
       <workItem from="1613594262179" duration="860000" />
       <workItem from="1613737644524" duration="2679000" />
-      <workItem from="1613767930279" duration="766000" />
-    </task>
-    <task id="LOCAL-00404" summary=".">
-      <created>1605694444185</created>
-      <option name="number" value="00404" />
-      <option name="presentableId" value="LOCAL-00404" />
-      <option name="project" value="LOCAL" />
-      <updated>1605694444186</updated>
+      <workItem from="1613767930279" duration="780000" />
+      <workItem from="1613993901536" duration="29821000" />
     </task>
     <task id="LOCAL-00405" summary=".">
       <created>1605696730817</created>
@@ -1320,7 +1305,14 @@
       <option name="project" value="LOCAL" />
       <updated>1613738341287</updated>
     </task>
-    <option name="localTasksCounter" value="453" />
+    <task id="LOCAL-00453" summary=".">
+      <created>1613816554456</created>
+      <option name="number" value="00453" />
+      <option name="presentableId" value="LOCAL-00453" />
+      <option name="project" value="LOCAL" />
+      <updated>1613816554457</updated>
+    </task>
+    <option name="localTasksCounter" value="454" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/lib/denon.php b/scripts/lib/denon.php
index 0df0cb23460d2a445a9d5858991c40011de0e0b0..0136cf6a3b90ce5c0cef6d6225dc1c4232ea6b3c 100644 (file)
--- a/scripts/lib/denon.php
+++ b/scripts/lib/denon.php
@@ -62,7 +62,7 @@ function denonAVRInput($input)
         usleep(1000000 * 0.5);
     }
 
-    denonAVRSetSpeakerPreset(1);
+    //denonAVRSetSpeakerPreset(1);
 }
 
 function denonAVRGetVolume()
@@ -141,10 +141,11 @@ function epson($on = true, $force = false)
         return;
     }
     $cmd = $on ? 'PowerOn' : 'PowerOff';
+    echo 'Epson ' . $cmd . "\n";
     sshCommand('/usr/local/bin/ir Epson ' . $cmd, 'salon');
     setState('EpsonPowerState', $on ? '1' : '0');
     if ($currentState !== $on && $on) {
-        sleep(15);
+        sleep(21);
     }
 }
 

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index a7965de1149fab362f85542636fa51773dac337d..3fe6b095376bda138d109ba8f927226993b3188a 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -384,7 +384,7 @@ $scenes = [
         ['type' => 'function', 'function' => 'chemineeOff', 'args' => ['salon']],
     ],
     'salon/media/off' => [
-        ['type' => 'function', 'function' => 'off','args'=>['salon']],
+        ['type' => 'function', 'function' => 'off','args'=> ['salon']],
     ],
     'salon/media/play' => [
 
@@ -581,7 +581,6 @@ $scenes = [
         ['type' => 'ecomode', 'mode' => '2'],
         ['type' => 'scene', 'scene' => 'cuisine/off'],
         ['type' => 'scene', 'scene' => 'salon/off'],
-        ['type' => 'scene', 'scene' => 'salon/media/off'],
         ['type' => 'scene', 'scene' => 'cour/off'],
         ['type' => 'scene', 'scene' => 'bureau/off'],
         ['type' => 'scene', 'scene' => 'chambre/off'],
@@ -595,6 +594,7 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'chambre/planetarium/off'],
         ['type' => 'ifttt', 'event' => 'coffee_off'],
         ['type' => 'scene', 'scene' => 'home/hueoff'],
+        ['type' => 'scene', 'scene' => 'salon/media/off'],
         ['type' => 'scene', 'scene' => 'salon/off', 'delay' => 2],
         //['type' => 'ifttt', 'event' => 'oven_off'],
     ],

diff --git a/servers/logcat.php b/servers/logcat.php
index 20b16a6a4500e7be4bfdafcfa1fab73484703c69..aa60bc97caf27d2d9b5cf16636068dd1fa004356 100644 (file)
--- a/servers/logcat.php
+++ b/servers/logcat.php
@@ -11,11 +11,12 @@ ignore_user_abort(true);
 
 $cases = [
     'Going to sleep due to power button' => function () use ($device) {
-        echo 'sleep' . "\n";
+        echo 'sleep ' . $device . "\n";
         off($device);
+        execScene('salon/on');
     },
     'Waking up from sleep' => function () use ($device) {
-        echo 'wakeup' . "\n";
+        echo 'wakeup ' . $device . "\n";
         if ($device == 'salon') {
             $state = 'maskShieldSalonWakeup';
             $squeezePlayer = 'Salon';
@@ -28,18 +29,18 @@ $cases = [
         }
     },
     'WindowManager: handleComboKeys keyCode: 25, keyAction: 1' => function () use ($device) {
-        echo 'volume-down' . "\n";
+        echo 'volume-down ' . $device . "\n";
         if ($device === 'bureau') {
             volume('3', '-', 'harmony');
-        }else if($device==='salon'){
+        } else if ($device === 'salon') {
             volume('2', '-', 'denonavr');
         }
     },
     'WindowManager: handleComboKeys keyCode: 24, keyAction: 1' => function () use ($device) {
-        echo 'volume-up' . "\n";
+        echo 'volume-up ' . $device . "\n";
         if ($device === 'bureau') {
             volume('3', '+', 'harmony');
-        }else if($device==='salon'){
+        } else if ($device === 'salon') {
             volume('2', '+', 'denonavr');
         }
     }