From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 10 Jul 2023 22:24:49 +0000 (+0200)
Subject: .
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=0a5254fa7cae916075833b3bddb5b1da78b26fa3;p=tortuga-home.git

.
---

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bc801c6..4f597da 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,11 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change afterPath="$PROJECT_DIR$/scripts/automodes.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/scripts/lib/automodes.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/automodes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/automodes.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/automodes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/automodes.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1231,7 +1229,7 @@
       <workItem from="1688849303515" duration="1558000" />
       <workItem from="1688897001591" duration="22890000" />
       <workItem from="1689010387612" duration="1878000" />
-      <workItem from="1689026578748" duration="401000" />
+      <workItem from="1689026578748" duration="609000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1576,7 +1574,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="570" />
+    <option name="localTasksCounter" value="571" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
diff --git a/scripts/automodes.php b/scripts/automodes.php
index 1159251..3f0d5de 100644
--- a/scripts/automodes.php
+++ b/scripts/automodes.php
@@ -5,4 +5,6 @@ if (isset($_GET['disable'])) {
 }
 if (isset($_GET['enable'])) {
 	enableAutoModes();
-}
\ No newline at end of file
+}
+
+echo 'automodes are ' . (isAutoModeEnabled() ? 'enabled' : 'disabled');
\ No newline at end of file
diff --git a/scripts/lib/automodes.php b/scripts/lib/automodes.php
index ab20b77..3813132 100644
--- a/scripts/lib/automodes.php
+++ b/scripts/lib/automodes.php
@@ -34,6 +34,9 @@ function autoRooms() {
 }
 
 function updateBureauAuto() {
+	if(!isAutoModeEnabled()){
+		return;
+	}
 	if (getState('bureauOff') == '1') {
 		execScene('bureau/off');
 		return;
@@ -61,6 +64,9 @@ function updateBureauAuto() {
 }
 
 function updateCuisine() {
+	if(!isAutoModeEnabled()){
+		return;
+	}
 	$salon = getState('salon', 'off');
 	if ($salon === 'day' || $salon === 'on' || $salon === 'off' || $salon === 'tamise') {
 		execScene('cuisine/base/on');
@@ -70,6 +76,9 @@ function updateCuisine() {
 }
 
 function updateCourAuto() {
+	if(!isAutoModeEnabled()){
+		return;
+	}
 	$h = date('H');
 	if ($h >= 7) {
 		execScene('cour/projecteurs/off');
@@ -130,6 +139,9 @@ function courAuto($on = true) {
 }
 
 function updateSalonAuto() {
+	if(!isAutoModeEnabled()){
+		return;
+	}
 	if (getState('salonOff') == '1') {
 		execScene('salon/off');
 		return;
@@ -158,6 +170,9 @@ function updateSalonAuto() {
 }
 
 function updateChambreAuto($transitionTime = null) {
+	if(!isAutoModeEnabled()){
+		return;
+	}
 	if (getState('chambreOff') == '1') {
 		execScene('chambre/off');
 		return;