.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b7edf878a7ead95067acc921d08f402824e26c9d..cc8078a102cc9173c372683f77a1539e1e1ab7d7 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,16 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change afterPath="$PROJECT_DIR$/scripts/lib/router.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/scripts/router_devices_list.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/js/home.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/home.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.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/ecomode.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/ecomode.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/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/pop.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/pop.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -781,14 +773,8 @@
       <workItem from="1576522031507" duration="1545000" />
       <workItem from="1577298113584" duration="24000" />
       <workItem from="1577298151244" duration="2270000" />
-      <workItem from="1577358967357" duration="4248000" />
-    </task>
-    <task id="LOCAL-00207" summary=".">
-      <created>1566458823293</created>
-      <option name="number" value="00207" />
-      <option name="presentableId" value="LOCAL-00207" />
-      <option name="project" value="LOCAL" />
-      <updated>1566458823293</updated>
+      <workItem from="1577358967357" duration="4847000" />
+      <workItem from="1577378088885" duration="2096000" />
     </task>
     <task id="LOCAL-00208" summary=".">
       <created>1566499257720</created>
@@ -1126,7 +1112,14 @@
       <option name="project" value="LOCAL" />
       <updated>1577310765026</updated>
     </task>
-    <option name="localTasksCounter" value="256" />
+    <task id="LOCAL-00256" summary=".">
+      <created>1577377271842</created>
+      <option name="number" value="00256" />
+      <option name="presentableId" value="LOCAL-00256" />
+      <option name="project" value="LOCAL" />
+      <updated>1577377271842</updated>
+    </task>
+    <option name="localTasksCounter" value="257" />
     <servers />
   </component>
   <component name="TodoView">
@@ -1187,10 +1180,10 @@
     </state>
     <state x="720" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577298128269" />
     <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1576479992407" />
-    <state x="701" y="114" key="CommitChangelistDialog2" timestamp="1577310762113">
+    <state x="701" y="114" key="CommitChangelistDialog2" timestamp="1577377266794">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="701" y="114" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1577310762113" />
+    <state x="701" y="114" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1577377266794" />
     <state x="701" y="127" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1575647157027" />
     <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1576522977384" />
     <state x="836" y="443" key="NewPhpFileDialog" timestamp="1577363498855">
@@ -1198,10 +1191,10 @@
     </state>
     <state x="836" y="443" key="NewPhpFileDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577363498855" />
     <state x="1114" y="443" key="NewPhpFileDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1576493932196" />
-    <state x="732" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1577358968384">
+    <state x="732" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1577378097353">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="732" y="343" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577358968384" />
+    <state x="732" y="343" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577378097353" />
     <state x="732" y="383" key="com.intellij.ide.util.TipDialog/0.0.1920.1160@0.0.1920.1160" timestamp="1575647093028" />
     <state x="976" y="343" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1576522032866" />
     <state x="976" y="257" width="607" height="526" key="find.popup" timestamp="1576492890263">

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index b69a133b1b7c3986a9cdd593a3457ee6fcb73864..9e609d43a8cea64db9d557e2a445f8bba61d74e5 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -286,31 +286,31 @@ $scenes = [
     ],
     'salon/on' => [
         ['type' => 'hue', 'group' => $salon, 'scene' => 'Gte8sl76rzAD1wO'],
-        ['type' => 'domoticz', 'device' => '1203', 'command' => true, 'priority' => true], // sapin
+        ['type' => 'domoticz', 'scene' => '3', 'command' => true, 'priority' => true], // sapin
         ['type' => 'insteon', 'command' => '0?113=I=0=0'],
         ['type' => 'scene', 'scene' => 'salon/cheminee', 'delay' => 1],
     ],
     'salon/off' => [
         ['type' => 'hue', 'group' => $salon, 'scene' => array('on' => false, 'brightness' => 0)],
-        ['type' => 'domoticz', 'device' => '1203', 'command' => false, 'priority' => true], // sapin
+        ['type' => 'domoticz', 'scene' => '3', 'command' => false, 'priority' => true],
         ['type' => 'insteon', 'command' => '0?133=I=0=0'],
         ['type' => 'function', 'function' => 'chemineeOff', 'args' => ['salon']],
     ],
     'salon/cinema' => [
         ['type' => 'ecomode', 'mode' => '0'],
-        ['type' => 'domoticz', 'device' => '1203', 'command' => true, 'priority' => true], // sapin
+        ['type' => 'domoticz', 'scene' => '4', 'command' => true, 'priority' => true],
         ['type' => 'hue', 'group' => $salon, 'scene' => 'AsU9eOyGsjEyz35'],
         ['type' => 'insteon', 'command' => '0?1111=I=0=0'],
     ],
     'salon/tamise' => [
-        ['type' => 'domoticz', 'device' => '1203', 'command' => true, 'priority' => true], // sapin
+        ['type' => 'domoticz', 'scene' => '4', 'command' => true, 'priority' => true],
         ['type' => 'ecomode', 'mode' => '0'],
         ['type' => 'hue', 'group' => $salon, 'scene' => 'RbjnIcLtcDuHbfU'],
         ['type' => 'insteon', 'command' => '0?1130=I=0=0'],
         ['type' => 'function', 'function' => 'chemineeOn', 'args' => ['salon', 'fire', 0.8]],
     ],
     'salon/lecturenocture' => [
-        ['type' => 'domoticz', 'device' => '1203', 'command' => true, 'priority' => true], // sapin
+        ['type' => 'domoticz', 'scene' => '4', 'command' => true, 'priority' => true],
         ['type' => 'hue', 'group' => $salon, 'scene' => 'HZiYyM6hMUMkmiY'],
         ['type' => 'insteon', 'command' => '0?1113=I=0=0'],
         ['type' => 'function', 'function' => 'chemineeOn', 'args' => ['salon', 'fire', 0.25]],
@@ -551,10 +551,10 @@ $scenes = [
         ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['Rivière', $squeezeboxPlayers['Salle de bains'], 65]],
     ],
     'salon/freebox/on' => [
-        ['type' => 'domoticz', 'device' => '479', 'command' => true, 'priority' => true],
+        //['type' => 'domoticz', 'device' => '479', 'command' => true, 'priority' => true],
     ],
     'salon/freebox/off' => [
-        ['type' => 'domoticz', 'device' => '479', 'command' => false, 'priority' => true],
+        //['type' => 'domoticz', 'device' => '479', 'command' => false, 'priority' => true],
     ],
     'ecomode/basic' => [
         ['type' => 'scene', 'scene' => 'bureau/media/off'],// Media bureau