.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8e401c3cc2e727e6713c7d9e10759ab5b90c77f0..9e279d8d9747b99a36939417d4b28c5847a35458 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +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/tv.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/tv.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/shield.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/shield.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/shield.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/shield.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1079,14 +1078,9 @@
       <workItem from="1644683361342" duration="9446000" />
       <workItem from="1645044938023" duration="1854000" />
       <workItem from="1645812379443" duration="615000" />
-      <workItem from="1646485258542" duration="4443000" />
-    </task>
-    <task id="LOCAL-00470" summary=".">
-      <created>1618909856303</created>
-      <option name="number" value="00470" />
-      <option name="presentableId" value="LOCAL-00470" />
-      <option name="project" value="LOCAL" />
-      <updated>1618909856304</updated>
+      <workItem from="1646485258542" duration="4468000" />
+      <workItem from="1647437683316" duration="79000" />
+      <workItem from="1649747856888" duration="2104000" />
     </task>
     <task id="LOCAL-00471" summary=".">
       <created>1618989464530</created>
@@ -1424,7 +1418,14 @@
       <option name="project" value="LOCAL" />
       <updated>1646485378810</updated>
     </task>
-    <option name="localTasksCounter" value="519" />
+    <task id="LOCAL-00519" summary=".">
+      <created>1646749626317</created>
+      <option name="number" value="00519" />
+      <option name="presentableId" value="LOCAL-00519" />
+      <option name="project" value="LOCAL" />
+      <updated>1646749626317</updated>
+    </task>
+    <option name="localTasksCounter" value="520" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 8b29ed254e98488460bac2579d17f086f61fadbe..c27713ab365d2dae917db67697918bb33dc49164 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -653,7 +653,7 @@ $scenes = [
     'home/off' => [
         ['type' => 'scene', 'scene' => 'home/hueoff'],
         ['type' => 'ecomode', 'mode' => '2'],
-        //['type' => 'scene', 'scene' => 'cuisine/off'],
+        ['type' => 'scene', 'scene' => 'cuisine/off'],
         ['type' => 'scene', 'scene' => 'salon/off'],
         ['type' => 'scene', 'scene' => 'cour/off'],
         ['type' => 'scene', 'scene' => 'bureau/base/off'],
@@ -675,6 +675,7 @@ $scenes = [
     ],
     'home/welcome' => [
         ['type' => 'scene', 'scene' => 'cuisine/on'],
+        ['type' => 'scene', 'scene' => 'cuisine/hotte/on'],
         ['type' => 'scene', 'scene' => 'salon/on'],
         ['type' => 'scene', 'scene' => 'bureau/auto'],
         ['type' => 'scene', 'scene' => 'chambre/auto'],
@@ -730,7 +731,6 @@ $scenes = [
     'wc/vmc/off' => [
         ['type' => 'domoticz', 'device' => '6449', 'command' => false, 'priority' => true],
     ],
-
     'sdb/ampli/on' => [
         ['type' => 'domoticz', 'device' => '476', 'command' => true, 'priority' => true],
     ],
@@ -779,13 +779,25 @@ $scenes = [
     'salon/freebox/off' => [
         ['type' => 'domoticz', 'device' => '1439', 'command' => false],
     ],
+    'cuisine/hotte/on' => [
+        ['type' => 'domoticz', 'scene' => 52, 'command' => true],
+    ],
+    'cuisine/hotte/off' => [
+        ['type' => 'domoticz', 'scene' => 52, 'command' => false],
+    ],
+    'cuisine/base/on' => [
+        ['type' => 'hue', 'group' => $cuisine, 'scene' => 'UDlNCnVQjTHZJFF'],
+    ],
     'cuisine/on' => [
-        ['type' => 'hue', 'group' => $cuisine, 'scene' => 'UDlNCnVQjTHZJFF']
+        ['type' => 'scene', 'scene' => 'cuisine/hotte/on'],
+        ['type' => 'scene', 'scene' => 'cuisine/base/on'],
     ],
     'cuisine/tamise' => [
+        ['type' => 'scene', 'scene' => 'cuisine/hotte/on'],
         ['type' => 'hue', 'group' => $cuisine, 'scene' => '44yXoQdJErFPksE']
     ],
     'cuisine/off' => [
+        ['type' => 'scene', 'scene' => 'cuisine/hotte/off'],
         //['type' => 'hue', 'group' => $cuisine, 'scene' => array('on' => false, 'brightness' => 0)]
     ],
     'cuisine/toaster/toggle' => [
@@ -1210,7 +1222,7 @@ function updateCuisine()
 {
     $salon = getState('salon', 'off');
     if ($salon === 'on' || $salon === 'off' || $salon === 'tamise') {
-        execScene('cuisine/on');
+        execScene('cuisine/base/on');
     } else if ($salon == 'cinema') {
         execScene('cuisine/tamise');
     }

diff --git a/scripts/lib/shield.php b/scripts/lib/shield.php
index 4395bd54804c5ce00df968a22a39948faf3fd603..b0321adfb096b797bef16e8d3ed6881c1d335f2c 100644 (file)
--- a/scripts/lib/shield.php
+++ b/scripts/lib/shield.php
@@ -182,7 +182,7 @@ function shieldMyCanalConnect($device = null, $force = false)
 {
     $d = getDevice($device);
     $state = 'mycanallastconnect_' . $d['id'];
-    $limit = time() - 3600 * 24 * 2;
+    $limit = time() - 3600 * 24 * 8;
     if (!$force && getState($state, 0) > $limit) {
         return;
     }