.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0d7f7ee79aa0454f52c3e008f8830ff2cdb8b76d..a589574a08c92027b6b001df2bba238a3453d6cc 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change beforePath="$PROJECT_DIR$/tools/xplanet/config" beforeDir="false" afterPath="$PROJECT_DIR$/tools/xplanet/config" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/lib/ecomode.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/ecomode.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1059,14 +1062,8 @@
       <workItem from="1640778900839" duration="879000" />
       <workItem from="1640787196827" duration="2522000" />
       <workItem from="1641573994164" duration="2000" />
-      <workItem from="1641574032847" duration="3595000" />
-    </task>
-    <task id="LOCAL-00454" summary=".">
-      <created>1614370268863</created>
-      <option name="number" value="00454" />
-      <option name="presentableId" value="LOCAL-00454" />
-      <option name="project" value="LOCAL" />
-      <updated>1614370268864</updated>
+      <workItem from="1641574032847" duration="6534000" />
+      <workItem from="1642149121693" duration="365000" />
     </task>
     <task id="LOCAL-00455" summary=".">
       <created>1614761270670</created>
@@ -1404,7 +1401,14 @@
       <option name="project" value="LOCAL" />
       <updated>1641726946298</updated>
     </task>
-    <option name="localTasksCounter" value="503" />
+    <task id="LOCAL-00503" summary=".">
+      <created>1641727076910</created>
+      <option name="number" value="00503" />
+      <option name="presentableId" value="LOCAL-00503" />
+      <option name="project" value="LOCAL" />
+      <updated>1641727076910</updated>
+    </task>
+    <option name="localTasksCounter" value="504" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php
index 7646f6ea29688e492a8cef5fef1c657c1cf4708f..f818101714fc43ebf437953711cb1b21909c57e2 100644 (file)
--- a/scripts/cron/cron.php
+++ b/scripts/cron/cron.php
@@ -18,7 +18,6 @@ function cronOneLoop($cronmin)
         cronVelib($cronmin);
         cronGuest($cronmin);
         cronShield($cronmin);
-
     }
     if ($cronmin % 10 == 0) {
         cronSqueezeFavorites($cronmin);

diff --git a/scripts/domoticz_device_event.php b/scripts/domoticz_device_event.php
index e23c3ce438502cb21b6af59807860bf880c73ad0..701fa9d915d9a75bb8e4606b4b025da8ceeeb0d1 100644 (file)
--- a/scripts/domoticz_device_event.php
+++ b/scripts/domoticz_device_event.php
@@ -4,7 +4,7 @@ define('TIMELIMIT', 1);
 $_GET['im'] = '5';
 
 $wcswitch = 6448;
-$cubesalon = ['6844'];
+$cubesalon = ['6844', '6846', '6848'];
 
 if (in_array($_GET['device'], $cubesalon)) {
     $forceConfig = 'salon';
@@ -79,7 +79,7 @@ if ($_GET['device'] == 480) {
             execScene('bureau/rideaux/toggle');
             break;
         case 'Flip_180':
-            execScene('bureau/fan/toggle');
+            execScene('bureau/auto');
             break;
         case 'Free_Fall':
             execScene('bureau/off');

diff --git a/scripts/lib/ecomode.php b/scripts/lib/ecomode.php
index cf914dcb92a5b84251af2c06a6a42f5aeddeb68e..5f9227e875bd4517ed523bb1d2481c41dd2b21b4 100644 (file)
--- a/scripts/lib/ecomode.php
+++ b/scripts/lib/ecomode.php
@@ -52,6 +52,11 @@ function getNightMode()
             return false;
         }
     }
+    if ($device === 'wc') {
+        if (getState('bureau_gradient') !== 'off') {
+            return false;
+        }
+    }
     if ($device === 'entree' || $device === 'cuisine') {
         $lights = [15, 18, 1, 58, 59, 57, 56, 55, 37];
         $hueLights = getHueInstance()->getLights();
@@ -61,7 +66,6 @@ function getNightMode()
                 return false;
             }
         }
-
     }
     return getState('night') == '1';
 }