.

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 6823b719b000f8675f16d6cad52c5f54b207e49e..0cedba027551f044353a3df177cfb52c7a6144f7 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-232.9921.47">
+  <component name="dataSourceStorageLocal" created-in="IU-232.10072.27">
     <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/misc.xml b/.idea/misc.xml
index 712d804fc336b2405f7da1dd8339dfe64b5d8b21..3e0d580a8719696da8fa8c78318195df903b1677 100644 (file)
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AhkProjectSettings">
+    <option name="defaultAhkSdk" value="AutoHotkey" />
+  </component>
   <component name="ClientPropertiesManager">
     <properties class="javax.swing.AbstractButton">
       <property name="hideActionText" class="java.lang.Boolean" />

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 454d0957e4695ab4f8000b23a31c7688a9a322de..b6f6bb3fe984eb4217db71ffe6d2e38dc211b8e9 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,8 +5,11 @@
   </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/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$/scripts/lib/homeassistant.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/homeassistant.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" />
@@ -234,33 +237,33 @@
     <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",
-    "git-widget-placeholder": "master",
-    "ignore.virus.scanning.warn.message": "true",
-    "last_opened_file_path": "D:/Works/rodadocavaco",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "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": "preferences.pluginManager",
-    "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;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/Works/rodadocavaco&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;preferences.pluginManager&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\Works\tortuga-home\scripts" />
@@ -1282,6 +1285,7 @@
       <workItem from="1696066442667" duration="1663000" />
       <workItem from="1696084066464" duration="645000" />
       <workItem from="1696152670454" duration="699000" />
+      <workItem from="1697390209410" duration="1520000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1626,7 +1630,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="596" />
+    <option name="localTasksCounter" value="597" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/rooms.php b/config/rooms.php
index b80261cf81818781d9bc311cd39bbcabeb20b3a4..030095a0f03c25634c8047ee26929b0e08d43f62 100644 (file)
--- a/config/rooms.php
+++ b/config/rooms.php
@@ -178,7 +178,7 @@ function cour()
         ['type' => 'light', 'scene' => 'cour/lumineux', 'label' => 'lumineux'],
         ['type' => 'light', 'scene' => 'cour/daylight', 'label' => 'jour'],
         ['type' => 'light', 'scene' => 'cour/grow', 'label' => 'croissance'],
-        ['type' => 'light', 'scene' => 'cour/tropical', 'label' => 'crepuscule tropical'],
+        ['type' => 'light', 'scene' => 'cour/tropical', 'label' => 'crépuscule tropical'],
         ['type' => 'separator', 'label' => 'Projecteurs'],
         ['type' => 'light', 'scene' => 'cour/projecteurs/on', 'label' => 'Allumer'],
         ['type' => 'light', 'scene' => 'cour/projecteurs/off', 'label' => 'éteindre'],

diff --git a/scripts/lib/homeassistant.php b/scripts/lib/homeassistant.php
index 253cfd018cfa8d0650a0503b9a869ab3f1372b10..3115f31a6a568d1c06289b91bf3cf93f5e9cec01 100644 (file)
--- a/scripts/lib/homeassistant.php
+++ b/scripts/lib/homeassistant.php
@@ -8,6 +8,7 @@ const HA_ECO_BASIC = 'switch.ecomode_basic';
 const HA_ECO_SUPER = 'switch.ecomode_super';
 const HA_HOTTE = 'switch.hotte';
 const HA_BAR = 'switch.bar';
+const HA_GROW_LAMPS='switch.0x00124b0025e24358';
 const HA_PLANETARIUM = 'switch.0xa4c138788071821e';
 
 const HA_OFFICE_CURTAIN='cover.office_curtain';

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 467b6d1a7ae2fe6bccde0aab8da213824573411e..9269591bf80f83a4207f4646b882b92c7fc26558 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -756,11 +756,9 @@ $scenes = [
     ],
     'sdb/ampli/on' => [
         ['type' => 'ha', 'device' => HA_SDB_AMPLI, 'priority' => true],
-        //['type' => 'domoticz', 'device' => $amplisdb, 'command' => true, 'priority' => true],
     ],
     'sdb/ampli/off' => [
         ['type' => 'ha', 'device' => HA_SDB_AMPLI, 'command' => 'turn_off', 'priority' => true],
-        //['type' => 'domoticz', 'device' => $amplisdb, 'command' => false, 'priority' => true],
     ],
     'sdb/hotwater/auto' => [
         ['type' => 'function', 'function' => 'hotwaterAutoMode', 'args' => ['1']],
@@ -804,12 +802,6 @@ $scenes = [
         ['type' => 'domoticz', 'scene' => 22, 'command' => true, 'priority' => true],
         ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['Nature sounds', $squeezeboxPlayers['Salle de bains'], 65]],
     ],
-    'salon/freebox/on' => [
-        ['type' => 'domoticz', 'device' => '1439', 'command' => true, 'priority' => true],
-    ],
-    'salon/freebox/off' => [
-        ['type' => 'domoticz', 'device' => '1439', 'command' => false],
-    ],
     'cuisine/hotte/on' => [
         ['type' => 'ha', 'device' => HA_HOTTE],
     ],
@@ -831,15 +823,6 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'cuisine/hotte/off'],
         //['type' => 'hue', 'group' => $cuisine, 'scene' => array('on' => false)]
     ],
-    'cuisine/toaster/toggle' => [
-        ['type' => 'domoticz', 'device' => '1453', 'command' => 'Toggle', 'priority' => true],
-    ],
-    'cuisine/toaster/on' => [
-        ['type' => 'domoticz', 'device' => '1453', 'command' => true, 'priority' => true],
-    ],
-    'cuisine/toaster/off' => [
-        ['type' => 'domoticz', 'device' => '1453', 'command' => false, 'priority' => true],
-    ],
     'cuisine/coffee/on' => [
         ['type' => 'function', 'function' => 'coffee_on'],
     ],
@@ -847,35 +830,28 @@ $scenes = [
         ['type' => 'function', 'function' => 'coffee_off'],
     ],
     'cour/auto' => [
-        ['type' => 'domoticz', 'device' => '6899', 'command' => true],
         ['type' => 'function', 'function' => 'courAuto', 'args' => [true]],
     ],
     'cour/daylight' => [
-        ['type' => 'domoticz', 'device' => '6899', 'command' => true],
-        ['type' => 'hue', 'group' => $cour, 'scene' => '8RyJJ3Dn7ayPQ8t'],
+        ['type' => 'ha', 'device' => 'scene.cour_daylight'],
     ],
     'cour/lumineux' => [
-        ['type' => 'domoticz', 'device' => '6899', 'command' => true],
-        ['type' => 'hue', 'group' => $cour, 'scene' => 'XzV1CuYIdHXPKoJ'],
+        ['type' => 'ha', 'device' => 'scene.cour_light'],
     ],
     'cour/tropical' => [
-        ['type' => 'domoticz', 'device' => '6899', 'command' => true],
-        ['type' => 'hue', 'group' => $cour, 'scene' => 'wBdbymg1w5ZZvtS'],
+        ['type' => 'ha', 'device' => 'scene.cour_tropical'],
     ],
     'cour/grow' => [
-        ['type' => 'domoticz', 'device' => '6899', 'command' => true],
-        ['type' => 'hue', 'group' => $cour, 'scene' => 'WVanIpWUWjkBjsS'],
+        ['type' => 'ha', 'device' => 'scene.cour_grow'],
     ],
     'cour/off' => [
-        ['type' => 'hue', 'group' => $cour, 'scene' => ['on' => false]],
-        ['type' => 'function', 'function' => 'courAuto', 'args' => [false]],
-        ['type' => 'domoticz', 'device' => '6899', 'command' => false],
+        ['type' => 'ha', 'device' => 'scene.cour_off'],
     ],
     'cour/projecteurs/on' => [
-        ['type' => 'domoticz', 'device' => '6898', 'command' => true],
+        ['type' => 'ha', 'device' => HA_GROW_LAMPS],
     ],
     'cour/projecteurs/off' => [
-        ['type' => 'domoticz', 'device' => '6898', 'command' => false],
+        ['type' => 'ha', 'device' => HA_GROW_LAMPS, 'command' => 'turn_off'],
     ],
     'ecomode/basic' => [
         ['type' => 'ha', 'device' => HA_ECO_BASIC, 'command' => 'turn_off'],