.

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 8edb0f691406f5be2aa1160f8a04015dff3ff6f0..a039eb91847c27d966772f9387e1c5b91b8d2d1e 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-231.9161.38">
+  <component name="dataSourceStorageLocal" created-in="IU-231.9225.16">
     <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/sshConfigs.xml b/.idea/sshConfigs.xml
index 6fbfbcde36407ff73eea14f9de848e9d17ab5ae0..a86e32898ea31068fee30805894cd07ad0913a32 100644 (file)
--- a/.idea/sshConfigs.xml
+++ b/.idea/sshConfigs.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="SshConfigs">
     <configs>
-      <sshConfig authType="PASSWORD" host="192.168.13.6" id="41cc0622-6eee-44fa-b4be-3776d5fa4005" port="22" nameFormat="DESCRIPTIVE" username="root" useOpenSSHConfig="true" />
+      <sshConfig authType="PASSWORD" host="192.168.13.7" id="41cc0622-6eee-44fa-b4be-3776d5fa4005" port="22" nameFormat="DESCRIPTIVE" username="root" useOpenSSHConfig="true" />
     </configs>
   </component>
 </project>
\ No newline at end of file

diff --git a/.idea/webServers.xml b/.idea/webServers.xml
index dc011750bbbf627e1acfa125c9b2a01e428a3dcf..38aaef231d97fd73f33dfbf7bf3f2974c854078b 100644 (file)
--- a/.idea/webServers.xml
+++ b/.idea/webServers.xml
@@ -3,7 +3,7 @@
   <component name="WebServers">
     <option name="servers">
       <webServer id="1bea9554-c4f3-46ca-863d-e24e0b12fe19" name="home.tortuga.enhydra.fr" url="https://salon.home.tortuga.enhydra.fr/">
-        <fileTransfer rootFolder="/docker/tortugahome/src" accessType="SFTP" host="192.168.13.6" port="22" sshConfigId="41cc0622-6eee-44fa-b4be-3776d5fa4005" sshConfig="root@192.168.13.6:22 password">
+        <fileTransfer rootFolder="/docker/tortugahome/src" accessType="SFTP" host="192.168.13.7" port="22" sshConfigId="41cc0622-6eee-44fa-b4be-3776d5fa4005" sshConfig="root@192.168.13.7:22 password">
           <advancedOptions>
             <advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />
           </advancedOptions>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4f597da5129e886956a0597d46faf6ec181e0674..2ed2406112fbf55cda1d1575637f766e55deee6a 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,9 +5,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/sshConfigs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/sshConfigs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/webServers.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/webServers.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/homeassistant.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/homeassistant.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/weatherstation.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/weatherstation.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1229,7 +1232,9 @@
       <workItem from="1688849303515" duration="1558000" />
       <workItem from="1688897001591" duration="22890000" />
       <workItem from="1689010387612" duration="1878000" />
-      <workItem from="1689026578748" duration="609000" />
+      <workItem from="1689026578748" duration="2434000" />
+      <workItem from="1689274022940" duration="239000" />
+      <workItem from="1689274317966" duration="657000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1574,7 +1579,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="571" />
+    <option name="localTasksCounter" value="572" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/lib/homeassistant.php b/scripts/lib/homeassistant.php
index 1f42bad49757c66badde8cf239c229663c90a25e..898f3434a64240d84d2bdac9978938ed42e58c7d 100644 (file)
--- a/scripts/lib/homeassistant.php
+++ b/scripts/lib/homeassistant.php
@@ -1,6 +1,6 @@
 <?php
 const HA_KEY = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiMjJlOWU2YzQ5ZTM0OTk5YTc3YTFjYzE3MDdiNTViNyIsImlhdCI6MTY4ODMxNTk0NywiZXhwIjoyMDAzNjc1OTQ3fQ.HS-KUXxaFE2esRydhqTfzCS7sc7eaZPVv0BE6NNGWas';
-const HA_URL = 'http://homeassistant.home.tortuga.enhydra.fr:8123/';
+const HA_URL = 'http://192.168.13.8:8123/';
 
 const HA_WC_VMC = 'switch.0x847127fffe280f20';
 const HA_SDB_AMPLI = 'switch.0xa4c138168147c1b6';

diff --git a/scripts/lib/weatherstation.php b/scripts/lib/weatherstation.php
index bb316a8b9d70ef6b3bbf7007e665cea8621b74d6..cb00e53fe13042b1530c57553361f73b63a33490 100644 (file)
--- a/scripts/lib/weatherstation.php
+++ b/scripts/lib/weatherstation.php
@@ -15,8 +15,8 @@ function getWeather() {
        $weather = json_decode(file_get_contents($cache), true);
        $weather = $weather[0];
        $res['temp'] = round(($weather['Temperature']['Metric']['Value']/* + getState('airtemperature')*/));
-       $res['outdoor_temp'] = toNumber(haGetState('sensor.outdoor_meter_balcony_temperature'), 1);
-       $res['outdoor_humidity'] = toNumber(haGetState('sensor.outdoor_meter_balcony_humidity'), true);
+       $res['outdoor_temp'] = toNumber(haGetState('sensor.indoor_outdoor_meter_ddf7_temperature'), 1);
+       $res['outdoor_humidity'] = toNumber(haGetState('sensor.indoor_outdoor_meter_ddf7_humidty'), true);
        $res['outdoor_pressure'] = toNumber(haGetState('sensor.0x00158d000464c885_pressure'), true);
        $res['backyard_temp'] = toNumber(haGetState('sensor.0x00158d000464c885_temperature'), 1);
        $res['backyard_humidity'] = toNumber(haGetState('sensor.0x00158d000464c885_humidity'), true);