.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2971d033cfe8b68d83cdf194e7163d08fb11547d..16c26b849d3e91705630740746fc2fb480fd5de6 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +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$/scripts/denon.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/denon.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/denon.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/denon.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/rooms.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/rooms.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" />
@@ -875,14 +875,8 @@
       <workItem from="1602007969304" duration="1163000" />
       <workItem from="1602145835697" duration="1903000" />
       <workItem from="1602248242424" duration="359000" />
-      <workItem from="1602501229079" duration="114000" />
-    </task>
-    <task id="LOCAL-00297" summary=".">
-      <created>1581497112479</created>
-      <option name="number" value="00297" />
-      <option name="presentableId" value="LOCAL-00297" />
-      <option name="project" value="LOCAL" />
-      <updated>1581497112479</updated>
+      <workItem from="1602501229079" duration="559000" />
+      <workItem from="1602581583330" duration="1284000" />
     </task>
     <task id="LOCAL-00298" summary=".">
       <created>1581499773377</created>
@@ -1220,7 +1214,14 @@
       <option name="project" value="LOCAL" />
       <updated>1602171129423</updated>
     </task>
-    <option name="localTasksCounter" value="346" />
+    <task id="LOCAL-00346" summary=".">
+      <created>1602501505304</created>
+      <option name="number" value="00346" />
+      <option name="presentableId" value="LOCAL-00346" />
+      <option name="project" value="LOCAL" />
+      <updated>1602501505304</updated>
+    </task>
+    <option name="localTasksCounter" value="347" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1266,11 +1267,11 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="872" y="161" key="#Plugins/0.0.2560.1040@0.0.2560.1040" timestamp="1596008801840" />
-    <state x="701" y="75" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1602171117745">
-      <screen x="0" y="0" width="1920" height="1160" />
+    <state x="935" y="70" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1602501499363">
+      <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="1602171117745" />
-    <state x="935" y="70" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1602145287303" />
+    <state x="935" y="70" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1602501499363" />
     <state x="1114" y="443" key="NewPhpFileDialog" timestamp="1602146675515">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>

diff --git a/config/rooms.php b/config/rooms.php
index 77337fbb5cb8b642ac2abfb36c692be8f20c2c38..4889999fb7d52591d32a7a3312ca42a3f1219147 100644 (file)
--- a/config/rooms.php
+++ b/config/rooms.php
@@ -1,6 +1,6 @@
 <?php
 
-$rooms = array('home' => 'Maison', 'salon' => 'Salon', 'chambre' => 'Chambre', 'bureau' => 'Bureau', 'sdb' => 'Salle de bain', 'cour' => 'Cour', 'wc' => 'WC');
+$rooms = array('home' => 'Maison', 'salon' => 'Salon', 'chambre' => 'Chambre', 'bureau' => 'Bureau', 'sdb' => 'Salle de bain', 'cour' => 'Cour', 'wc' => 'WC', 'cuisine' => 'Cuisine');
 
 function chambre($additionnalfavorites = array())
 {
@@ -110,8 +110,9 @@ function bureau()
 function cuisine()
 {
     $favorites = [
-        //['type' => 'light', 'scene' => 'cuisine/on', 'label' => 'Allumer'],
-        //['type' => 'light', 'scene' => 'cuisine/off', 'label' => 'éteindre'],
+        ['type' => 'light', 'scene' => 'cuisine/on', 'label' => 'Allumer'],
+        ['type' => 'light', 'scene' => 'cuisine/off', 'label' => 'éteindre'],
+        ['type' => 'light', 'scene' => 'cuisine/tamise', 'label' => 'Tamisé'],
     ];
     $all = array_merge($favorites, [
 

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 804bde21c95c1a622920fb38d83a953349cd7ac2..c9b9e70be2aa6a7b56a344d2118312eb37e9e2c2 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -302,6 +302,7 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'chambre/bed'],
         ['type' => 'scene', 'scene' => 'bureau/off'],
         ['type' => 'scene', 'scene' => 'salon/off'],
+        ['type' => 'scene', 'scene' => 'cuisine/off'],
         ['type' => 'scene', 'scene' => 'cour/off'],
         ['type' => 'function', 'function' => 'stopHarmony'],
         ['type' => 'function', 'function' => 'stopAllSqueezebox'],
@@ -324,6 +325,7 @@ $scenes = [
     ],
     'salon/cinema' => [
         ['type' => 'hue', 'group' => $salon, 'scene' => 'AsU9eOyGsjEyz35'],
+        ['type' => 'scene', 'scene' => 'cuisine/tamise'],
         ['type' => 'ecomode', 'mode' => '0'],
         ['type' => 'insteon', 'command' => '0?1111=I=0=0'],
         ['type' => 'hue', 'group' => $salon, 'scene' => 'AsU9eOyGsjEyz35'],
@@ -485,6 +487,7 @@ $scenes = [
     'home/off' => [
         ['type' => 'scene', 'scene' => 'home/hueoff'],
         ['type' => 'ecomode', 'mode' => '2'],
+        ['type' => 'scene', 'scene' => 'cuisine/off'],
         ['type' => 'scene', 'scene' => 'salon/off'],
         ['type' => 'scene', 'scene' => 'cour/off'],
         ['type' => 'scene', 'scene' => 'bureau/off'],
@@ -504,6 +507,7 @@ $scenes = [
     ],
     'home/welcome' => [
         ['type' => 'ecomode', 'mode' => '0'],
+        ['type' => 'scene', 'scene' => 'cuisine/on'],
         ['type' => 'scene', 'scene' => 'salon/on'],
         ['type' => 'scene', 'scene' => 'bureau/auto'],
         ['type' => 'scene', 'scene' => 'chambre/auto'],
@@ -599,6 +603,15 @@ $scenes = [
     'salon/freebox/off' => [
         ['type' => 'domoticz', 'device' => '1439', 'command' => false],
     ],
+    'cuisine/on' => [
+        ['type' => 'hue', 'group' => $cuisine, 'scene' => 'UDlNCnVQjTHZJFF']
+    ],
+    'cuisine/tamise' => [
+        ['type' => 'hue', 'group' => $cuisine, 'scene' => '44yXoQdJErFPksE']
+    ],
+    'cuisine/off' => [
+        ['type' => 'hue', 'group' => $cuisine, 'scene' => array('on' => false, 'brightness' => 0)]
+    ],
     'cour/auto' => [
         ['type' => 'domoticz', 'device' => '678', 'command' => true],
         ['type' => 'function', 'function' => 'courAuto', 'args' => [true]],