.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4c3f3edc083a02513eefef0e59592735e1d220dc..9bc4408c6d6f273b9842572478847ec5665d02e8 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,6 @@
   <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/freeboxchannel.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/freeboxchannel.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" />
@@ -867,14 +866,8 @@
       <workItem from="1599118677122" duration="2877000" />
       <workItem from="1599210105610" duration="1219000" />
       <workItem from="1599397263288" duration="714000" />
-      <workItem from="1599417261812" duration="294000" />
-    </task>
-    <task id="LOCAL-00293" summary=".">
-      <created>1581414712831</created>
-      <option name="number" value="00293" />
-      <option name="presentableId" value="LOCAL-00293" />
-      <option name="project" value="LOCAL" />
-      <updated>1581414712831</updated>
+      <workItem from="1599417261812" duration="501000" />
+      <workItem from="1599417922867" duration="2676000" />
     </task>
     <task id="LOCAL-00294" summary=".">
       <created>1581434421749</created>
@@ -1212,7 +1205,14 @@
       <option name="project" value="LOCAL" />
       <updated>1599316711212</updated>
     </task>
-    <option name="localTasksCounter" value="342" />
+    <task id="LOCAL-00342" summary=".">
+      <created>1599417770384</created>
+      <option name="number" value="00342" />
+      <option name="presentableId" value="LOCAL-00342" />
+      <option name="project" value="LOCAL" />
+      <updated>1599417770385</updated>
+    </task>
+    <option name="localTasksCounter" value="343" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1262,11 +1262,11 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="760" y="94" key="#Project_Structure/0.0.2560.1040@0.0.2560.1040" timestamp="1592377765650" />
-    <state x="935" y="70" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1599316661177">
+    <state x="935" y="70" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1599417756076">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1598265694837" />
-    <state x="935" y="70" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1599316661177" />
+    <state x="935" y="70" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1599417756076" />
     <state x="1060" y="275" key="FileChooserDialogImpl" timestamp="1590912263817">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 01701cecc1cc2755c52b1df18b7287f8fd65109e..54e3ab49ab6770b1923489686bf2cff5e03e0801 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -572,13 +572,12 @@ $scenes = [
     ],
     'sdb/off' => [
         ['type' => 'state', 'key' => 'sdb', 'value' => 0],
-        ['type' => 'hue', 'group' => $sdb, 'scene' => ['on' => false]],
+        ['type' => 'domoticz', 'scene' => 20, 'command' => false, 'priority' => true],
         ['type' => 'function', 'function' => 'stopSqueezeboxPlayer', 'args' => [$squeezeboxPlayers['Salle de bains'], false]],
     ],
     'sdb/on' => [
         ['type' => 'state', 'key' => 'sdb', 'value' => 1],
-        ['type' => 'hue', 'group' => $sdb, 'scene' => ['effect' => 'none']],
-        ['type' => 'hue', 'group' => $sdb, 'scene' => 'LmwN0cs0qsep2sA'],
+        ['type' => 'domoticz', 'scene' => 20, 'command' => true, 'priority' => true],
     ],
     'sdb/morning' => [
         ['type' => 'state', 'key' => 'sdb', 'value' => 1],
@@ -587,12 +586,11 @@ $scenes = [
     ],
     'sdb/nuit' => [
         ['type' => 'state', 'key' => 'sdb', 'value' => 1],
-        ['type' => 'hue', 'group' => $sdb, 'scene' => ['effect' => 'none']],
-        ['type' => 'hue', 'group' => $sdb, 'scene' => 'S59ayiWOy11L2tR'],
+        ['type' => 'domoticz', 'scene' => 21, 'command' => true, 'priority' => true],
     ],
     'sdb/spa' => [
         ['type' => 'state', 'key' => 'sdb', 'value' => 1],
-        ['type' => 'hue', 'group' => $sdb, 'scene' => ['effect' => 'colorloop', 'on' => true, 'brightness' => 128]],
+        ['type' => 'domoticz', 'scene' => 22, 'command' => true, 'priority' => true],
         ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['Rivière', $squeezeboxPlayers['Salle de bains'], 65]],
     ],
     'salon/freebox/on' => [
@@ -622,7 +620,6 @@ $scenes = [
         ['type' => 'hue', 'group' => $cour, 'scene' => 'WVanIpWUWjkBjsS'],
     ],
     'cour/off' => [
-        // ['type' => 'domoticz', 'device' => '678', 'command' => false],
         ['type' => 'hue', 'group' => $cour, 'scene' => ['on' => false]],
         ['type' => 'function', 'function' => 'courAuto', 'args' => [false]],
     ],
@@ -934,18 +931,20 @@ function courAuto($on = true)
 function updateChambreAuto($transitionTime = null)
 {
     $hours = intval(date('H'));
-    if ($hours <= 1) {
-        $scene = 'tropical';
-    } else if ($hours <= 7) {
-        $scene = 'tonic';
-    } else if ($hours <= 11) {
+    if ($hours <= 4) {
+        $scene = 'party';
+    } else if ($hours <= 9) {
         $scene = 'boreal';
+    } else if ($hours <= 11) {
+        $scene = 'tonic';
     } else if ($hours <= 14) {
         $scene = 'flowers';
     } else if ($hours <= 18) {
         $scene = 'beach';
-    } else {
+    } else if ($hours <= 22) {
         $scene = 'tropical';
+    } else {
+        $scene = 'party';
     }
     execScene('chambre/' . $scene, false, $transitionTime);
 }
@@ -953,12 +952,12 @@ function updateChambreAuto($transitionTime = null)
 function updateBureauAuto()
 {
     $hours = intval(date('H'));
-    if ($hours <= 3) {
+    if ($hours <= 4) {
         $scene = 'outrun';
-    } else if ($hours <= 7) {
-        $scene = 'tonic';
-    } else if ($hours <= 11) {
+    } else if ($hours <= 9) {
         $scene = 'boreal';
+    } else if ($hours <= 11) {
+        $scene = 'tonic';
     } else if ($hours <= 14) {
         $scene = 'flowers';
     } else if ($hours <= 18) {