From: vincent <vincent@enhydra.fr>
Date: Sat, 22 Jan 2022 15:19:32 +0000 (+0100)
Subject: .
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=54b3a2634ade690d09a3eef8b85112d04ae11c03;p=tortuga-home.git

.
---

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dff337d..c9df4bb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,8 @@
 <project version="4">
   <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/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.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/switchbot.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/switchbot.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/squeezebox.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1067,14 +1065,7 @@
       <workItem from="1642240002240" duration="1108000" />
       <workItem from="1642761590471" duration="1992000" />
       <workItem from="1642848701157" duration="3435000" />
-      <workItem from="1642856038290" duration="5632000" />
-    </task>
-    <task id="LOCAL-00460" summary=".">
-      <created>1616837886170</created>
-      <option name="number" value="00460" />
-      <option name="presentableId" value="LOCAL-00460" />
-      <option name="project" value="LOCAL" />
-      <updated>1616837886170</updated>
+      <workItem from="1642856038290" duration="5973000" />
     </task>
     <task id="LOCAL-00461" summary=".">
       <created>1617266964333</created>
@@ -1412,7 +1403,14 @@
       <option name="project" value="LOCAL" />
       <updated>1642863251325</updated>
     </task>
-    <option name="localTasksCounter" value="509" />
+    <task id="LOCAL-00509" summary=".">
+      <created>1642864397546</created>
+      <option name="number" value="00509" />
+      <option name="presentableId" value="LOCAL-00509" />
+      <option name="project" value="LOCAL" />
+      <updated>1642864397546</updated>
+    </task>
+    <option name="localTasksCounter" value="510" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 20211fa..a22f788 100644
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -646,7 +646,6 @@ $scenes = [
     'home/off' => [
         ['type' => 'scene', 'scene' => 'home/hueoff'],
         ['type' => 'ecomode', 'mode' => '2'],
-        ['type' => 'function', 'key' => 'hotwaterAutoMode', 'args' => ['1']],
         //['type' => 'scene', 'scene' => 'cuisine/off'],
         ['type' => 'scene', 'scene' => 'salon/off'],
         ['type' => 'scene', 'scene' => 'cour/off'],
@@ -665,6 +664,7 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'home/hueoff'],
         ['type' => 'scene', 'scene' => 'salon/media/off'],
         ['type' => 'scene', 'scene' => 'salon/off', 'delay' => 2],
+        ['type' => 'function', 'key' => 'hotwaterAutoMode', 'args' => ['1']],
     ],
     'home/welcome' => [
         ['type' => 'scene', 'scene' => 'cuisine/on'],
@@ -744,9 +744,9 @@ $scenes = [
     ],
     'sdb/off' => [
         ['type' => 'state', 'key' => 'sdb', 'value' => 0],
-        ['type' => 'function', 'key' => 'hotwaterAutoMode', 'args' => ['1']],
         ['type' => 'domoticz', 'scene' => 20, 'command' => false, 'priority' => true],
         ['type' => 'function', 'function' => 'stopSqueezeboxPlayer', 'args' => [$squeezeboxPlayers['Salle de bains'], false]],
+        ['type' => 'function', 'key' => 'hotwaterAutoMode', 'args' => ['1']],
     ],
     'sdb/on' => [
         ['type' => 'state', 'key' => 'sdb', 'value' => 1],
diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php
index 5dec618..252cbaf 100644
--- a/scripts/lib/squeezebox.php
+++ b/scripts/lib/squeezebox.php
@@ -157,6 +157,7 @@ function squeezePlayerOn($player)
 //        }
     } else if ($player == $squeezeboxPlayers['Salle de bains']) {
         execScene('sdb/ampli/on');
+
         if (getSqueezePlayerStatus($player) < 0) {
             phoneTask('Tortuga', 'sdb');
         }