.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6cb04e6bed5036438998e7c51468e5a18a135d9a..31199d3db44fdc4f7bcf8d87ea7b72029ca97fe0 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,22 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change afterPath="$PROJECT_DIR$/scripts/homeconnect.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/scripts/lib/homeconnect.php" afterDir="false" />
       <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$/config/salon.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/salon.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/images/rooms/medium/cuisine.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/medium/cuisine.jpg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/images/rooms/medium/salon.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/medium/salon.jpg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/images/rooms/originaux/cuisine.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/originaux/cuisine.jpg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/images/rooms/originaux/salon.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/originaux/salon.jpg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/images/rooms/small/cuisine.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/small/cuisine.jpg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/images/rooms/small/salon.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/small/salon.jpg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/http.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/http.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/redis.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/redis.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/coffee.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/coffee.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/lib/state.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/state.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1014,14 +1001,7 @@
       <workItem from="1618426400216" duration="1138000" />
       <workItem from="1618656192286" duration="2313000" />
       <workItem from="1618682288258" duration="2117000" />
-      <workItem from="1618740509693" duration="11544000" />
-    </task>
-    <task id="LOCAL-00420" summary=".">
-      <created>1607546493721</created>
-      <option name="number" value="00420" />
-      <option name="presentableId" value="LOCAL-00420" />
-      <option name="project" value="LOCAL" />
-      <updated>1607546493722</updated>
+      <workItem from="1618740509693" duration="12495000" />
     </task>
     <task id="LOCAL-00421" summary=".">
       <created>1607933724635</created>
@@ -1359,7 +1339,14 @@
       <option name="project" value="LOCAL" />
       <updated>1618426951296</updated>
     </task>
-    <option name="localTasksCounter" value="469" />
+    <task id="LOCAL-00469" summary=".">
+      <created>1618861174900</created>
+      <option name="number" value="00469" />
+      <option name="presentableId" value="LOCAL-00469" />
+      <option name="project" value="LOCAL" />
+      <updated>1618861174900</updated>
+    </task>
+    <option name="localTasksCounter" value="470" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/coffee.php b/config/coffee.php
index ff5220e7ec42aa7addc7403fdce9ad6ecce4db16..6229f74b504731267f3ef7096fd035c6a8bd17e0 100644 (file)
--- a/config/coffee.php
+++ b/config/coffee.php
@@ -1,12 +1,12 @@
 <?php
 $shortcuts['coffee'] = [
-    ['type' => 'light','scene'=>'cuisine/toaster/toggle',  'label' => 'Grille pain'],
+    ['type' => 'light', 'scene' => 'cuisine/toaster/toggle', 'label' => 'Grille pain'],
     ['type' => 'separator', 'label' => 'Machine à café'],
-    ['type' => 'ifttt', 'event' => 'coffee_on', 'label' => 'Allumer'],
-    ['type' => 'ifttt', 'event' => 'coffee_off', 'label' => 'éteindre'],
-    ['type' => 'separator', 'label' => 'Cafés'],
-    ['type' => 'ifttt', 'event' => 'coffee_vincent', 'label' => 'Vincent'],
-    ['type' => 'ifttt', 'event' => 'coffee_jerome', 'label' => 'Jérôme'],
-    ['type' => 'ifttt', 'event' => 'coffee_expresso', 'label' => 'Expresso'],
-    ['type' => 'ifttt', 'event' => 'coffee_americano', 'label' => 'Americano'],
+    ['type' => 'light', 'scene' => 'cuisine/coffee/on', 'label' => 'Allumer'],
+    ['type' => 'light', 'scene' => 'cuisine/coffee/off', 'label' => 'éteindre'],
+//    ['type' => 'separator', 'label' => 'Cafés'],
+//    ['type' => 'ifttt', 'event' => 'coffee_vincent', 'label' => 'Vincent'],
+//    ['type' => 'ifttt', 'event' => 'coffee_jerome', 'label' => 'Jérôme'],
+//    ['type' => 'ifttt', 'event' => 'coffee_expresso', 'label' => 'Expresso'],
+//    ['type' => 'ifttt', 'event' => 'coffee_americano', 'label' => 'Americano'],
 ];
\ No newline at end of file

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 0377826e9a944feaea7791ad91b82e047049f5b2..142e7909a1f98696a9ae7f411f3bde33c3f4f96e 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -34,8 +34,8 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'chambre/planetarium/off'],
         ['type' => 'function', 'function' => 'bedbrightness', 'args' => [255]],
         ['type' => 'phonetask', 'phone' => 'vincent', 'task' => 'Matin'],
-        ['type' => 'function', 'function' => 'coffee_on'],
         ['type' => 'scene', 'scene' => 'chambre/auto', 'delay' => 35],
+        ['type' => 'scene', 'scene' => 'cuisine/coffee/on'],
     ],
     'chambre/deshumidificateur/on' => [
         //['type' => 'domoticz', 'device' => $chambrefan, 'command' => true],
@@ -631,7 +631,7 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'chambre/deshumidificateur/on'],
         ['type' => 'phonetask', 'phone' => 'vincent', 'task' => 'Stop All Sounds'],
         ['type' => 'scene', 'scene' => 'chambre/planetarium/off'],
-        ['type' => 'function', 'function' => 'coffee_off'],
+        ['type' => 'scene', 'scene' => 'cuisine/coffee/off'],
         ['type' => 'scene', 'scene' => 'home/hueoff'],
         ['type' => 'scene', 'scene' => 'salon/media/off'],
         ['type' => 'scene', 'scene' => 'salon/off', 'delay' => 2],
@@ -754,6 +754,12 @@ $scenes = [
     'cuisine/toaster/off' => [
         ['type' => 'domoticz', 'device' => '1453', 'command' => false, 'priority' => true],
     ],
+    'cuisine/coffee/on' => [
+        ['type' => 'function', 'function' => 'coffee_on'],
+    ],
+    'cuisine/coffee/off' => [
+        ['type' => 'function', 'function' => 'coffee_off'],
+    ],
     'cour/auto' => [
         ['type' => 'domoticz', 'device' => '678', 'command' => true],
         ['type' => 'function', 'function' => 'courAuto', 'args' => [true]],