.

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index b656d5d65f1450c6c0f6abbec13965090774ea90..d77fb634a6ed9af7de36ce5bef264f03ab8d58d3 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -43,12 +43,12 @@ services:
       - './src/:/home/tortugahome/www/'
       - './src/bin/:/usr/local/bin/'
       #           - './sessions:/var/lib/php/sessions'
-      - 'share:/nas/'
-      - 'share:/volume1/Share/'
-      - 'share:/Share/'
-      - 'videos:/nas/Videos/'
-      - 'videos:/volume1/Share/Videos/'
-      - 'videos:/Share/Videos/'
+#      - 'share:/nas/'
+#      - 'share:/volume1/Share/'
+#      - 'share:/Share/'
+#      - 'videos:/nas/Videos/'
+#      - 'videos:/volume1/Share/Videos/'
+#      - 'videos:/Share/Videos/'
       - './log:/var/log/tortugahome'
       - './src/.docker/config/at.allow:/etc/at.allow:ro'
       - './src/.docker/config/at.deny:/etc/at.deny:ro'
@@ -77,14 +77,14 @@ networks:
     external:
       name: tortugahome
 
-volumes:
-  share:
-    driver_opts:
-      type: cifs
-      o: "username=Share,password=dcfyjbcyckwydtgufjx,rw,file_mode=0777,dir_mode=0777"
-      device: "//192.168.7.31/Share"
-  videos:
-    driver_opts:
-      type: cifs
-      o: "username=Share,password=dcfyjbcyckwydtgufjx,rw,file_mode=0777,dir_mode=0777"
-      device: "//192.168.7.31/Media/Videos"
+#volumes:
+#  share:
+#    driver_opts:
+#      type: cifs
+#      o: "username=Share,password=dcfyjbcyckwydtgufjx,rw,file_mode=0777,dir_mode=0777"
+#      device: "//192.168.7.31/Share"
+#  videos:
+#    driver_opts:
+#      type: cifs
+#      o: "username=Share,password=dcfyjbcyckwydtgufjx,rw,file_mode=0777,dir_mode=0777"
+#      device: "//192.168.7.31/Media/Videos"

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 93f61a555352a013bcd3afce3548e9d95a15c94f..3e6c89f241c3ef324681974ef530424a327e4741 100644 (file)
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-242.23339.11">
+  <component name="dataSourceStorageLocal" created-in="IU-243.22562.218">
     <data-source name="LFY(3).db" uuid="e5a3291d-855f-44b2-be41-76fe6b0c2136">
       <database-info product="SQLite" version="3.25.1" jdbc-version="2.1" driver-name="SQLite JDBC" driver-version="3.25.1" dbms="SQLITE" exact-version="3.25.1" exact-driver-version="3.25">
         <identifier-quote-string>&quot;</identifier-quote-string>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d7620507e5ba4f88d19b85346e0b944c6f43853f..80c935e5168b333c540750a3fc87de094d28447c 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,14 +5,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
+      <change beforePath="$PROJECT_DIR$/.docker/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/docker-compose.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/dnsmasq.conf" beforeDir="false" afterPath="$PROJECT_DIR$/config/dnsmasq.conf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/rooms.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/rooms.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/salon.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/salon.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/simplemode.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/simplemode.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gradient.php" beforeDir="false" afterPath="$PROJECT_DIR$/gradient.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/homeassistant_device_event.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/homeassistant_device_event.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/ecomode.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/ecomode.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -244,6 +243,7 @@
   &quot;keyToString&quot;: {
     &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
     &quot;Shell Script.Docker terminal.executor&quot;: &quot;Run&quot;,
     &quot;Shell Script.Update DNS.executor&quot;: &quot;Run&quot;,
     &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
@@ -256,7 +256,7 @@
     &quot;git-widget-placeholder&quot;: &quot;master&quot;,
     &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
     &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/Works/rodadocavaco&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/Works/tortuga-home&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
@@ -421,8 +421,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9823dce3aa75-28b599e66164-intellij.indexing.shared.core-IU-242.23339.11" />
-        <option value="bundled-js-predefined-d6986cc7102b-5c90d61e3bab-JavaScript-IU-242.23339.11" />
+        <option value="bundled-jdk-9823dce3aa75-fdfe4dae3a2d-intellij.indexing.shared.core-IU-243.22562.218" />
+        <option value="bundled-js-predefined-d6986cc7102b-deb605915726-JavaScript-IU-243.22562.218" />
       </set>
     </attachedChunks>
   </component>
@@ -1335,7 +1335,13 @@
       <workItem from="1721977403266" duration="1931000" />
       <workItem from="1723070986479" duration="239000" />
       <workItem from="1727248399195" duration="2492000" />
-      <workItem from="1727812356049" duration="116000" />
+      <workItem from="1727812356049" duration="2763000" />
+      <workItem from="1730102719772" duration="2304000" />
+      <workItem from="1730188591752" duration="696000" />
+      <workItem from="1730715973196" duration="1165000" />
+      <workItem from="1732059067198" duration="1924000" />
+      <workItem from="1736151123675" duration="1953000" />
+      <workItem from="1736236568379" duration="239000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1680,7 +1686,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="621" />
+    <option name="localTasksCounter" value="622" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/gradient.php b/gradient.php
index df7eb0a755e7b09072320405fa33f0b34192ab48..85582e4d55b72b91773757671c43454b886936d2 100644 (file)
--- a/gradient.php
+++ b/gradient.php
@@ -78,12 +78,13 @@
             }, 5000);
         });
 
+
         function fullscreen() {
             try {
                 if (nw !== undefined) {
                     var ns = 5;
                     var win = nw.Window.get();
-                    win.moveTo(-1 * ns * 900, 0);
+                    win.moveTo((ns - 1) * -900, 0);
                     win.resizeTo(ns * 900, 1440);
                     win.setAlwaysOnTop(true);
                 }

diff --git a/scripts/homeassistant_device_event.php b/scripts/homeassistant_device_event.php
index 210e60f0da22f613cbd8b3e736d5a29b6793aad3..de1c03580ee676fe88b06346dd77193ba2527596 100644 (file)
--- a/scripts/homeassistant_device_event.php
+++ b/scripts/homeassistant_device_event.php
@@ -5,14 +5,14 @@ $_GET['im'] = '5';
 if ($_GET['state'] === 'None') {
     exit;
 }
-const HA_SWITCH_BUREAU = 'sensor.0x0c4314fffe7ce957_action';
-const HA_SWITCH_WC = 'sensor.0x70ac08fffe911960_action';
-const HA_CUBE_BUREAU = 'sensor.0x00158d00042d7082_action';
+const HA_SWITCH_BUREAU = 'event.double_interrupeur_cour_action';
+const HA_SWITCH_WC = 'event.interrupteur_wc_action';
+const HA_CUBE_BUREAU = 'event.cube_bureau_action';
 const HA_SWITCH_BEDROOM = 'binary_sensor.switch_bedroom';
 const HA_CUBE_BATHROOM = 'sensor.0x00158d0005c19a86_action';
-const HA_CUBE_SALON_1 = 'sensor.0x00158d00029ba2b6_action';
-const HA_CUBE_SALON_2 = 'sensor.0x00158d00042dc656_action';
-const HA_CUBE_SALON_3 = 'sensor.0x00158d00058a55da_action';
+const HA_CUBE_SALON_1 = 'event.cube_salon_1_action';
+const HA_CUBE_SALON_2 = 'event.cube_salon_2_action';
+const HA_CUBE_SALON_3 = 'event.cube_salon_3_action';
 
 
 switch ($_GET['id']) {

diff --git a/scripts/lib/ecomode.php b/scripts/lib/ecomode.php
index bdea404668045a5f3d09f9ec5cd5e9e2590113b0..b401664730660ed59eb5b54ea5bb5e804ebd9c6b 100644 (file)
--- a/scripts/lib/ecomode.php
+++ b/scripts/lib/ecomode.php
@@ -51,10 +51,7 @@ function getNightMode($device = null)
             return false;
         }
     } else if ($device === 'bureau' || $device === 'bureausun') {
-        if (haGetState(HA_OFFICE_CURTAIN) === 'closed') {
-            return true;
-        }
-        return getState('bureauOff') == '1';
+        return (in_array(haGetState(HA_OFFICE_CURTAIN), ['off', 'closed']));
     } else if ($device === 'entree' || $device === 'cuisine') {
         $lights = [15, 18, 1, 58, 59, 57, 56, 55, 37];
         $hueLights = getHueInstance()->getLights();

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index b1ca4b60c804ddb3ada84f23c201e8b151e73078..0d17f40b8e6428a6aa2367c523d274e8bd29301c 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -862,12 +862,12 @@ $scenes = [
 
 function welcomeEco()
 {
-    $businessHour = [7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19];
-    if (isWeekEnd() || !in_array(date('G'), $businessHour)) {
-        execScene('home/welcome/eco/salon');
-    } else {
-        execScene('home/welcome/eco/homeoffice');
-    }
+//    $businessHour = [7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19];
+//    if (isWeekEnd() || !in_array(date('G'), $businessHour)) {
+    execScene('home/welcome/eco/salon');
+//    } else {
+//        execScene('home/welcome/eco/homeoffice');
+//    }
 }
 
 function bureauRideau($cmd)