.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 93e8602acb5da6a8ee3990bf016cc44f42f7c804..6d39c3c80d34472946a50d517d3c7fd187a14524 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,7 @@
   <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/share.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/share.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -269,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>
@@ -906,14 +895,8 @@
       <workItem from="1604828693023" duration="1255000" />
       <workItem from="1605001866699" duration="7793000" />
       <workItem from="1605087671373" duration="102000" />
-      <workItem from="1605087787424" duration="33417000" />
-    </task>
-    <task id="LOCAL-00339" summary=".">
-      <created>1596139717624</created>
-      <option name="number" value="00339" />
-      <option name="presentableId" value="LOCAL-00339" />
-      <option name="project" value="LOCAL" />
-      <updated>1596139717624</updated>
+      <workItem from="1605087787424" duration="33487000" />
+      <workItem from="1605261347643" duration="600000" />
     </task>
     <task id="LOCAL-00340" summary=".">
       <created>1598265728108</created>
@@ -1251,7 +1234,14 @@
       <option name="project" value="LOCAL" />
       <updated>1605188063167</updated>
     </task>
-    <option name="localTasksCounter" value="388" />
+    <task id="LOCAL-00388" summary=".">
+      <created>1605188139134</created>
+      <option name="number" value="00388" />
+      <option name="presentableId" value="LOCAL-00388" />
+      <option name="project" value="LOCAL" />
+      <updated>1605188139134</updated>
+    </task>
+    <option name="localTasksCounter" value="389" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1297,11 +1287,11 @@
       <screen x="0" y="0" width="1707" height="920" />
     </state>
     <state x="740" y="229" key="#com.jetbrains.php.refactoring.extractMethod.PhpExtractMethodDialog#function0/0.0.1707.920@0.0.1707.920" timestamp="1604146905948" />
-    <state x="701" y="75" width="737" height="502" key="CommitChangelistDialog2" timestamp="1605188054768">
+    <state x="701" y="75" width="737" height="502" key="CommitChangelistDialog2" timestamp="1605188136787">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
     <state x="132" y="0" width="737" height="502" key="CommitChangelistDialog2/0.0.1707.920@0.0.1707.920" timestamp="1605086955514" />
-    <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1605188054768" />
+    <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1605188136787" />
     <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1605171492435" />
     <state x="952" y="244" key="FileChooserDialogImpl" timestamp="1605104496549">
       <screen x="0" y="0" width="2560" height="1040" />

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 932fa335fe04d361090d5ff419a761f68fbe221f..0d33d3d1068a1a0fd16b28308a3853c2d2f7bd92 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -404,110 +404,87 @@ $scenes = [
         ['type' => 'ecomode', 'mode' => '0'],
         ['type' => 'function', 'function' => 'wakeupPC', 'args' => ['avion']],
     ],
-    'bureau/l61/on' => [
-        ['type' => 'domoticz', 'device' => '2074', 'command' => true, 'priority' => true],
-    ],
-    'bureau/l61/off' => [
-        ['type' => 'domoticz', 'device' => '2074', 'command' => false, 'priority' => true],
-    ],
     'bureau/lumineux' => [
-        ['type' => 'scene', 'scene' => 'bureau/l61/on'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'SdXwtZu5PCDjK2h'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'lumineux'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
     ],
     'bureau/veilleuse' => [
-        ['type' => 'scene', 'scene' => 'bureau/l61/off'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'ooQq4Jfbf1CleDy'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'veilleuse'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
     ],
     'bureau/flowers' => [
-        ['type' => 'scene', 'scene' => 'bureau/l61/on'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'mJ-AVlYFyL5x1cN'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'flowers'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
     ],
     'bureau/tchernobyl' => [
-        ['type' => 'scene', 'scene' => 'bureau/l61/off'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'KoByn2ehWHDdchu'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'tchernobyl'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
     ],
     'bureau/outrun' => [
-        ['type' => 'scene', 'scene' => 'bureau/l61/off'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => '9TzWQt6f7-EgVtm'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'outrun'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
     ],
     'bureau/boreal' => [
-        ['type' => 'scene', 'scene' => 'bureau/l61/on'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'boreal'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'dJaWFQBb0APEgtL'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
     ],
     'bureau/tropical' => [
-        ['type' => 'scene', 'scene' => 'bureau/l61/on'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'biXLpKpIZYDlxen'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'tropical'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
     ],
     'bureau/lounge' => [
-        ['type' => 'scene', 'scene' => 'bureau/l61/off'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'vvE8WAMdNpgswrw'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'lounge'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
     ],
     'bureau/focus' => [
-        ['type' => 'scene', 'scene' => 'bureau/l61/on'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'yPYgG-zQWuAA13d'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'space'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
     ],
     'bureau/tonic' => [
-        ['type' => 'scene', 'scene' => 'bureau/l61/on'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'S-YiVWKsEKipL0G'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'tonic'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
     ],
     'bureau/lecture' => [
-        ['type' => 'scene', 'scene' => 'bureau/l61/on'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'Hjr7rfz4LC9xVoB'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'lecture'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
     ],
     'bureau/chillout' => [
-        ['type' => 'scene', 'scene' => 'bureau/l61/off'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => '-UOMTUG6z-hMbRA'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'chillout'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
     ],
     'bureau/tamise' => [
-        ['type' => 'scene', 'scene' => 'bureau/l61/off'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => '8fgGg2ylE4aO3t3'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'tamise'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
     ],
     'bureau/beach' => [
-        ['type' => 'scene', 'scene' => 'bureau/l61/on'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => '0mPAKOl-Kw8Fwb1'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'beach'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
     ],
     'bureau/jellyfish' => [
-        ['type' => 'scene', 'scene' => 'bureau/l61/off'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'VhHVIcN-nKLwP9E'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'jellyfish'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
     ],
     'bureau/sharks' => [
-        ['type' => 'scene', 'scene' => 'bureau/l61/off'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'VhHVIcN-nKLwP9E'],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'sharks'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
     ],
     'bureau/off' => [
-        ['type' => 'scene', 'scene' => 'bureau/l61/off'],
         ['type' => 'function', 'function' => 'bureauAuto', 'args' => [false]],
         ['type' => 'hue', 'group' => $bureau, 'scene' => array('on' => false, 'brightness' => 0)],
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'off'],