.

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 55d14f5d7a7cc7bda8e1b60bf1d365e5cecd49d1..0d0c1a222f08e46cd9fe6aa021930d2dc0162bfb 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-251.26094.121">
+  <component name="dataSourceStorageLocal" created-in="IU-252.26830.84">
     <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 bd24b791a3c9b1c9a3cd78f4873b07e198ea9cc5..5a91d3b8650e143d1d6974b949bf18b5a8184474 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,9 @@
     <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/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/shield.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/shield.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/rooms.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/rooms.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/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" />
@@ -240,6 +242,7 @@
     &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
     &quot;SHELLCHECK.PATH&quot;: &quot;C:\\Users\\vince\\AppData\\Roaming\\JetBrains\\IntelliJIdea2025.1\\plugins\\Shell Script\\shellcheck.exe&quot;,
     &quot;Shell Script.Docker terminal.executor&quot;: &quot;Run&quot;,
@@ -420,8 +423,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9823dce3aa75-fbdcb00ec9e3-intellij.indexing.shared.core-IU-251.26094.121" />
-        <option value="bundled-js-predefined-d6986cc7102b-b26f3e71634d-JavaScript-IU-251.26094.121" />
+        <option value="bundled-jdk-9823dce3aa75-bf35d07a577b-intellij.indexing.shared.core-IU-252.26830.84" />
+        <option value="bundled-js-predefined-d6986cc7102b-3aa1da707db6-JavaScript-IU-252.26830.84" />
       </set>
     </attachedChunks>
   </component>
@@ -1351,7 +1354,12 @@
       <workItem from="1749025974811" duration="112000" />
       <workItem from="1749027906070" duration="11028000" />
       <workItem from="1749046861871" duration="948000" />
-      <workItem from="1749064910217" duration="647000" />
+      <workItem from="1749064910217" duration="1694000" />
+      <workItem from="1753434742918" duration="1000" />
+      <workItem from="1753434847576" duration="6000" />
+      <workItem from="1757096550934" duration="2780000" />
+      <workItem from="1760964057023" duration="1038000" />
+      <workItem from="1760983092185" duration="58000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1696,7 +1704,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="629" />
+    <option name="localTasksCounter" value="630" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/rooms.php b/config/rooms.php
index e495a85a78ae38f8325770a1f8773034f9c8f9d9..42bbe9831344cf901b467556d1f4c1acf3aed208 100644 (file)
--- a/config/rooms.php
+++ b/config/rooms.php
@@ -86,14 +86,13 @@ function salon()
     ];
 
     if (!isSimpleMode()) {
-        $favorites = array_merge($favorites, ['type' => 'light', 'scene' => 'salon/day', 'label' => 'journée'],
+        $favorites = array_merge($favorites, [['type' => 'light', 'scene' => 'salon/day', 'label' => 'journée'],
             ['type' => 'light', 'scene' => 'salon/lumineux', 'label' => 'lumineux'],
             ['type' => 'light', 'scene' => 'salon/cineclub', 'label' => 'cinéma de minuit'],
             ['type' => 'light', 'scene' => 'salon/tamise', 'label' => 'Tamisé'],
             ['type' => 'light', 'scene' => 'salon/lecturenocture', 'label' => 'Lecture nocturne'],
             ['type' => 'light', 'scene' => 'salon/cheminee', 'label' => 'Cheminée'],
-            ['type' => 'light', 'scene' => 'salon/theatre', 'label' => 'Théâtre'],
-            ['type' => 'light', 'scene' => 'salon/bar/toggle', 'label' => 'Bar'],);
+            ['type' => 'light', 'scene' => 'salon/bar/toggle', 'label' => 'Bar']]);
     }
 
     $all = array_merge($favorites, [['type' => 'separator', 'label' => 'Projecteur'],
@@ -108,6 +107,7 @@ function bureau()
         ['type' => 'light', 'scene' => 'bureau/auto', 'label' => 'Allumer'],
         ['type' => 'light', 'scene' => 'bureau/off', 'label' => 'éteindre'],
         ['type' => 'light', 'scene' => 'bureau/cinema', 'label' => 'Cinéma'],
+        ['type' => 'light', 'scene' => 'bureau/teletravail', 'label' => 'Télétravail'],
     ];
 
     if (!isSimpleMode()) {

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 0d17f40b8e6428a6aa2367c523d274e8bd29301c..da71e55f9533fabc150fb419365dd3760e72a60c 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -424,6 +424,11 @@ $scenes = [
     ],
     'salon/fan/toggle' => [
     ],
+    'bureau/teletravail' => [
+        ['type' => 'scene', 'scene' => 'bureau/auto'],
+        ['type' => 'scene', 'scene' => 'bureau/pc/wakeup'],
+        ['type' => 'ha', 'device' => HA_OFFICE_MAIN_SCREEN],
+    ],
     'bureau/pc/wakeup' => [
         ['type' => 'function', 'function' => 'wakeupPC', 'args' => ['avion']],
     ],

diff --git a/scripts/lib/weatherstation.php b/scripts/lib/weatherstation.php
index c4d9a7bd1f7e1a3d77dd50e3debaca1d3c747f35..5e6aa9e83ec81388c70f7c4fc4ca5417461849a1 100644 (file)
--- a/scripts/lib/weatherstation.php
+++ b/scripts/lib/weatherstation.php
@@ -33,9 +33,9 @@ function getWeather()
     $res['wc_humidity'] = toNumber(haGetState('sensor.sb_wc_humidite'), true);
     $res['office_temp'] = toNumber(haGetState('sensor.sb_bureau_temperature'), 1);
     $res['office_humidity'] = toNumber(haGetState('sensor.sb_bureau_humidite'), true);
-    $res['cocodrilo_min'] = toNumber(haGetState('sensor.temperature_interieure_minimale', null, 'cocodrilo'));
-    $res['cocodrilo_max'] = toNumber(haGetState('sensor.temperature_interieure_maximale', null, 'cocodrilo'));
-    $res['cocodrilo_humidity'] = toNumber(haGetState('sensor.humidite_interieure', null, 'cocodrilo'),true);
+    $res['cocodrilo_min'] = toNumber(haGetState('sensor.temperature_interieure_minimale', null, 'cocodrilo'), true);
+    $res['cocodrilo_max'] = toNumber(haGetState('sensor.temperature_interieure_maximale', null, 'cocodrilo'), true);
+    $res['cocodrilo_humidity'] = toNumber(haGetState('sensor.humidite_interieure', null, 'cocodrilo'), true);
     $res['cellar_humidity'] = 0;
     $res['cellar_temp'] = 0;
     $res['pressure'] = round($weather['Pressure']['Metric']['Value']);