.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ecd02cd3688dbd751cef9ce21317dc14ce2e6a0b..5752476e6dbf0441650c19d8c0276d4aa43f7175 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,11 +3,8 @@
   <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$/scripts/lib/flowerpower.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/flowerpower.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/pc.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/pc.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/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/squeezebox.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" />
@@ -272,17 +269,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>
@@ -933,13 +919,9 @@
       <workItem from="1607084835284" duration="6328000" />
       <workItem from="1607323219546" duration="11053000" />
       <workItem from="1607439614302" duration="1182000" />
-    </task>
-    <task id="LOCAL-00371" summary=".">
-      <created>1604477496171</created>
-      <option name="number" value="00371" />
-      <option name="presentableId" value="LOCAL-00371" />
-      <option name="project" value="LOCAL" />
-      <updated>1604477496171</updated>
+      <workItem from="1607546452054" duration="634000" />
+      <workItem from="1607872973632" duration="1438000" />
+      <workItem from="1607932840253" duration="607000" />
     </task>
     <task id="LOCAL-00372" summary=".">
       <created>1604521524933</created>
@@ -1277,7 +1259,14 @@
       <option name="project" value="LOCAL" />
       <updated>1607418039594</updated>
     </task>
-    <option name="localTasksCounter" value="420" />
+    <task id="LOCAL-00420" summary=".">
+      <created>1607546493721</created>
+      <option name="number" value="00420" />
+      <option name="presentableId" value="LOCAL-00420" />
+      <option name="project" value="LOCAL" />
+      <updated>1607546493722</updated>
+    </task>
+    <option name="localTasksCounter" value="421" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/lib/pc.php b/scripts/lib/pc.php
index ab75dfc3ada775557512d4892da7cd719adb8bbc..e30f41ffd158c5dbb0eac86da1411ebd1a7ed423 100644 (file)
--- a/scripts/lib/pc.php
+++ b/scripts/lib/pc.php
@@ -22,11 +22,16 @@ function sleepPC($device)
 {
     $s = 'device_' . $device . '_awake';
     if (getState($s) == '0') {
-        echo 'already sleeping '.$device.' :: '.$s;
+        echo 'already sleeping ' . $device . ' :: ' . $s;
         return;
     }
     setState($s, '0');
     $res = sshCommand('"C:\Program Files\Scripts\sleep.bat"', $device, false);
     setState($s, '0');
     return $res;
+}
+
+function pcScreensProfile($profile, $device)
+{
+    sshCommand('"C:\Program Files (x86)\DisplayFusion\DisplayFusionCommand.exe" -monitorloadprofile "' . $profile . '"', $device, false,true);
 }
\ No newline at end of file

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 0a03301201552ade99b28a40ccaf0fcfa916bd39..f4a2658b5f62ccf9424429c478f488fea622cffa 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -394,6 +394,12 @@ $scenes = [
     'bureau/sleeppc' => [
         ['type' => 'function', 'function' => 'sleepPC', 'args' => ['avion']],
     ],
+    'bureau/screens/off' => [
+        ['type' => 'function', 'function' => 'pcScreensProfile', 'args' => ['Games', 'avion']]
+    ],
+    'bureau/screens/on' => [
+        ['type' => 'function', 'function' => 'pcScreensProfile', 'args' => ['Tortuga', 'avion']]
+    ],
     'bureau/auto' => [
         ['type' => 'function', 'function' => 'bureauAuto', 'args' => [true]],
     ],
@@ -405,81 +411,103 @@ $scenes = [
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'SdXwtZu5PCDjK2h'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'lumineux'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
+        ['type' => 'scene', 'scene' => 'bureau/screens/on'],
     ],
     'bureau/veilleuse' => [
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'ooQq4Jfbf1CleDy'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'veilleuse'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
+        ['type' => 'scene', 'scene' => 'bureau/screens/on'],
     ],
     'bureau/flowers' => [
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'mJ-AVlYFyL5x1cN'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'flowers'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
+        ['type' => 'scene', 'scene' => 'bureau/screens/on'],
+    ],
+    'bureau/videogames' => [
+        ['type' => 'hue', 'group' => $bureau, 'scene' => 'ooQq4Jfbf1CleDy'],
+        ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'veilleuse'],
+        ['type' => 'scene', 'scene' => 'bureau/base/on'],
+        ['type' => 'scene', 'scene' => 'bureau/screens/off'],
     ],
     'bureau/tchernobyl' => [
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'KoByn2ehWHDdchu'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'tchernobyl'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
+        ['type' => 'scene', 'scene' => 'bureau/screens/on'],
     ],
     'bureau/outrun' => [
         ['type' => 'hue', 'group' => $bureau, 'scene' => '9TzWQt6f7-EgVtm'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'outrun'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
+        ['type' => 'scene', 'scene' => 'bureau/screens/on'],
     ],
     'bureau/boreal' => [
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'boreal'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'dJaWFQBb0APEgtL'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
+        ['type' => 'scene', 'scene' => 'bureau/screens/on'],
     ],
     'bureau/tropical' => [
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'biXLpKpIZYDlxen'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'tropical'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
+        ['type' => 'scene', 'scene' => 'bureau/screens/on'],
     ],
     'bureau/lounge' => [
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'vvE8WAMdNpgswrw'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'lounge'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
+        ['type' => 'scene', 'scene' => 'bureau/screens/on'],
     ],
     'bureau/focus' => [
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'yPYgG-zQWuAA13d'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'space'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
+        ['type' => 'scene', 'scene' => 'bureau/screens/on'],
     ],
     'bureau/tonic' => [
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'S-YiVWKsEKipL0G'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'tonic'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
+        ['type' => 'scene', 'scene' => 'bureau/screens/on'],
     ],
     'bureau/lecture' => [
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'Hjr7rfz4LC9xVoB'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'lecture'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
+        ['type' => 'scene', 'scene' => 'bureau/screens/on'],
     ],
     'bureau/chillout' => [
         ['type' => 'hue', 'group' => $bureau, 'scene' => '-UOMTUG6z-hMbRA'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'chillout'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
+        ['type' => 'scene', 'scene' => 'bureau/screens/on'],
     ],
     'bureau/tamise' => [
         ['type' => 'hue', 'group' => $bureau, 'scene' => '8fgGg2ylE4aO3t3'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'tamise'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
+        ['type' => 'scene', 'scene' => 'bureau/screens/on'],
     ],
     'bureau/beach' => [
         ['type' => 'hue', 'group' => $bureau, 'scene' => '0mPAKOl-Kw8Fwb1'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'beach'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
+        ['type' => 'scene', 'scene' => 'bureau/screens/on'],
     ],
     'bureau/jellyfish' => [
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'VhHVIcN-nKLwP9E'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'jellyfish'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
+        ['type' => 'scene', 'scene' => 'bureau/screens/on'],
     ],
     'bureau/sharks' => [
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'VhHVIcN-nKLwP9E'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'sharks'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
+        ['type' => 'scene', 'scene' => 'bureau/screens/on'],
     ],
     'bureau/off' => [
         ['type' => 'function', 'function' => 'bureauAuto', 'args' => [false]],