.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d837e8a7aeb471f942f8848ddaca4829fab0964f..1b9be3fae5b975140b35ffd9ff38f3533d891606 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </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/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/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/scripts/lib/klarstein.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/hotwater.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/hotwater.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$/config/rooms.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/rooms.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/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" />
@@ -232,27 +234,31 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "true",
-    "WebServerToolWindowPanel.toolwindow.highlight.mappings": "true",
-    "WebServerToolWindowPanel.toolwindow.highlight.symlinks": "true",
-    "WebServerToolWindowPanel.toolwindow.show.date": "false",
-    "WebServerToolWindowPanel.toolwindow.show.permissions": "false",
-    "WebServerToolWindowPanel.toolwindow.show.size": "false",
-    "deletionFromPopupRequiresConfirmation": "false",
-    "last_opened_file_path": "D:/Works/tortuga-home/node_modules",
-    "nodejs_package_manager_path": "npm",
-    "project.structure.last.edited": "Project",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.2",
-    "ruby.rails.projectView.checked": "true",
-    "settings.editor.selected.configurable": "editor.preferences.fonts.default",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.highlight.mappings&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.highlight.symlinks&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.date&quot;: &quot;false&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.permissions&quot;: &quot;false&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.size&quot;: &quot;false&quot;,
+    &quot;deletionFromPopupRequiresConfirmation&quot;: &quot;false&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/Works/tortuga-home/node_modules&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;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
+    &quot;ruby.rails.projectView.checked&quot;: &quot;true&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;editor.preferences.fonts.default&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="T:\Drive\Works\home" />
@@ -1183,14 +1189,10 @@
       <workItem from="1669377758083" duration="457000" />
       <workItem from="1669384803169" duration="746000" />
       <workItem from="1669880738062" duration="41000" />
-      <workItem from="1669880798666" duration="262000" />
-    </task>
-    <task id="LOCAL-00495" summary=".">
-      <created>1639915732929</created>
-      <option name="number" value="00495" />
-      <option name="presentableId" value="LOCAL-00495" />
-      <option name="project" value="LOCAL" />
-      <updated>1639915732933</updated>
+      <workItem from="1669880798666" duration="763000" />
+      <workItem from="1670747610011" duration="3339000" />
+      <workItem from="1670938658004" duration="715000" />
+      <workItem from="1671182830643" duration="65000" />
     </task>
     <task id="LOCAL-00496" summary=".">
       <created>1640269478891</created>
@@ -1528,7 +1530,14 @@
       <option name="project" value="LOCAL" />
       <updated>1669377847531</updated>
     </task>
-    <option name="localTasksCounter" value="544" />
+    <task id="LOCAL-00544" summary=".">
+      <created>1669881079546</created>
+      <option name="number" value="00544" />
+      <option name="presentableId" value="LOCAL-00544" />
+      <option name="project" value="LOCAL" />
+      <updated>1669881079546</updated>
+    </task>
+    <option name="localTasksCounter" value="545" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/rooms.php b/config/rooms.php
index d0f21dc79613b3d1ecb48a89207e1a09ee222991..301cc28d3f354f8ae9355d4c2d68b1696d634b26 100644 (file)
--- a/config/rooms.php
+++ b/config/rooms.php
@@ -81,6 +81,7 @@ function bureau()
     $favorites = [
         ['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/lumineux', 'label' => 'Lumineux'],
         ['type' => 'light', 'scene' => 'bureau/lounge', 'label' => 'Lounge'],
         ['type' => 'light', 'scene' => 'bureau/tamise', 'label' => 'Tamise'],

diff --git a/scripts/lib/klarstein.php b/scripts/lib/klarstein.php
new file mode 100644 (file)
index 0000000..b3d9bbc
--- /dev/null
+++ b/scripts/lib/klarstein.php
@@ -0,0 +1 @@
+<?php

diff --git a/scripts/lib/lib.php b/scripts/lib/lib.php
index 40a9f49158dc0c2e0b706a2942bf59ad008829cc..8c483f6531d8a351d8beab0d8a704cd67fb92f5d 100644 (file)
--- a/scripts/lib/lib.php
+++ b/scripts/lib/lib.php
@@ -52,6 +52,7 @@ require_once ROOT . '/scripts/lib/homeconnect.php';
 require_once ROOT . '/scripts/lib/wol.php';
 require_once ROOT . '/scripts/lib/switchbot.php';
 require_once ROOT . '/scripts/lib/ical.php';
+require_once ROOT . '/scripts/lib/klarstein.php';
 
 
 profile('Loaded libraries', __FILE__, __LINE__);

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index e9001df993478fe3e6008070247c27db16eabd20..b277c2c936089fa1ea00187694417c7fe23742df 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -695,6 +695,8 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'salon/auto'],
         ['type' => 'ecomode', 'mode' => '0'],
         ['type' => 'scene', 'scene' => 'sdb/hotwater/auto'],
+        ['type' => 'scene', 'scene' => 'bureau/off'],
+        ['type' => 'scene', 'scene' => 'chambre/off'],
     ],
 
     'home/welcome/eco/homeoffice' => [
@@ -702,6 +704,8 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'bureau/auto'],
         ['type' => 'ecomode', 'mode' => '0'],
         ['type' => 'scene', 'scene' => 'sdb/hotwater/auto'],
+        ['type' => 'scene', 'scene' => 'salon/off'],
+        ['type' => 'scene', 'scene' => 'chambre/off'],
     ],
 
     'home/welcome' => [