.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 403d82242d6b9339ae55c1a7d2ab791367186e98..7c32049ed60af9099cc3f8051c5f2f04a60445ac 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +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/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" />
@@ -780,14 +782,9 @@
       <workItem from="1578343490755" duration="8304000" />
       <workItem from="1578429518225" duration="1270000" />
       <workItem from="1578473134474" duration="933000" />
-      <workItem from="1578556363591" duration="2952000" />
-    </task>
-    <task id="LOCAL-00226" summary=".">
-      <created>1567671880464</created>
-      <option name="number" value="00226" />
-      <option name="presentableId" value="LOCAL-00226" />
-      <option name="project" value="LOCAL" />
-      <updated>1567671880464</updated>
+      <workItem from="1578556363591" duration="2961000" />
+      <workItem from="1578759225069" duration="373000" />
+      <workItem from="1578771487829" duration="1660000" />
     </task>
     <task id="LOCAL-00227" summary=".">
       <created>1567940163895</created>
@@ -1125,7 +1122,14 @@
       <option name="project" value="LOCAL" />
       <updated>1578556780231</updated>
     </task>
-    <option name="localTasksCounter" value="275" />
+    <task id="LOCAL-00275" summary=".">
+      <created>1578559851311</created>
+      <option name="number" value="00275" />
+      <option name="presentableId" value="LOCAL-00275" />
+      <option name="project" value="LOCAL" />
+      <updated>1578559851311</updated>
+    </task>
+    <option name="localTasksCounter" value="276" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1177,12 +1181,12 @@
     </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="935" y="114" key="CommitChangelistDialog2" timestamp="1578558724803">
+    <state x="935" y="114" key="CommitChangelistDialog2" timestamp="1578855499055">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="701" y="114" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1577381105204" />
     <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="1578558724803" />
+    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1578855499055" />
     <state x="1114" y="443" key="NewPhpFileDialog" timestamp="1578038647334">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1192,12 +1196,12 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="872" y="242" key="Vcs.Push.Dialog.v2/0.0.2560.1040@0.0.2560.1040" timestamp="1578558711439" />
-    <state x="976" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1578556363447">
+    <state x="976" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1578771487764">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="732" y="343" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577380394903" />
     <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="1578556363447" />
+    <state x="976" y="343" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1578771487764" />
     <state x="976" y="257" width="607" height="536" key="find.popup" timestamp="1578556582887">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>

diff --git a/config/global.php b/config/global.php
index c70b3280a62a1590566fad408e7f8ccbc52f0204..fef2bc283495abdab29b1ac95d48cb7bbcef5e64 100644 (file)
--- a/config/global.php
+++ b/config/global.php
@@ -16,7 +16,7 @@ define('LONGITUDE', 2.3422104);
 $squeezeboxPlayers = array(
     'Salle de bains' => 'b8:27:eb:ab:b4:50',
     'Salon' => 'dc:a6:32:02:47:c1',
-    'Chambre' => 'b8:27:eb:73:33:89',
+    'Chambre' => 'b8:27:eb:31:e1:44',
     'WC' => '00:04:20:2a:05:2e',
     'Cuisine' => 'b8:27:eb:ec:71:34',
     'Lit Jérôme' => 'b8:27:eb:62:d3:ce',
@@ -37,12 +37,12 @@ $devices = [
     'sdb' => ['id' => 'sdb', 'host' => '192.168.13.63', 'user' => 'pi', 'password' => 'atacama'],
     'entree' => ['id' => 'entree', 'host' => '192.168.13.64', 'user' => 'pi', 'password' => 'atacama'],
     'jarvis' => ['id' => 'jarvis', 'host' => '192.168.13.60', 'user' => 'jarvis', 'password' => 'atacama'],
-    'minitel1' => ['id' => 'minitel1', 'host' => '192.168.13.65', 'user' => 'pi', 'password' => 'atacama'],
+    'chambre' => ['id' => 'chambre', 'host' => '192.168.13.65', 'user' => 'pi', 'password' => 'atacama'],
     'salon' => ['id' => 'salon', 'host' => '192.168.13.66', 'user' => 'pi', 'password' => 'atacama'],
     'bureau' => ['id' => 'bureau', 'host' => '192.168.13.67', 'user' => 'pi', 'password' => 'atacama'],
     'cuisine' => ['id' => 'cuisine', 'host' => '192.168.13.68', 'user' => 'pi', 'password' => 'atacama'],
     'bureausun' => ['id' => 'bureausun', 'host' => '192.168.13.70', 'user' => 'pi', 'password' => 'atacama'],
-    'lit' => ['id' => 'lit', 'host' => '192.168.13.71', 'user' => 'pi', 'password' => 'atacama'],
+    'lit' => ['id' => 'lit', 'host' => '192.168.13.69', 'user' => 'pi', 'password' => 'atacama'],
     'avion' => ['id' => 'avion', 'host' => '192.168.13.5', 'user' => 'Tortuga', 'password' => 's77vpo*wu', 'mac' => 'E0:D5:5E:68:67:B9'],
 ];
 

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 4d69ac0ea9a197d0ce596a164c7b40abda9e27e6..89ff526db2862847a1d65e28df931d580a4fad84 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -551,10 +551,10 @@ $scenes = [
         ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['Rivière', $squeezeboxPlayers['Salle de bains'], 65]],
     ],
     'salon/freebox/on' => [
-        ['type' => 'domoticz', 'device' => '1265', 'command' => true, 'priority' => true],
+        ['type' => 'domoticz', 'device' => '478', 'command' => true, 'priority' => true],
     ],
     'salon/freebox/off' => [
-        ['type' => 'domoticz', 'device' => '1265', 'command' => false, 'priority' => true],
+        ['type' => 'domoticz', 'device' => '478', 'command' => false, 'priority' => true],
     ],
     'ecomode/basic' => [
         ['type' => 'scene', 'scene' => 'bureau/media/off'],// Media bureau