.

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 90e7ff90b92725d190bcc1ced3b378c9384d0352..2427b23630319b1d629b907e4e03535b651bd26c 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.8109.175">
+  <component name="dataSourceStorageLocal" created-in="IU-231.9011.34">
     <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 f7f3eb1248e20d71003690091f537dc0e4178f58..3f18f3d3e475e0e8f39d35798f7dfdd4a1806428 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,9 +6,11 @@
   <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/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/global.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/global.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -233,32 +235,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",
-    "last_opened_file_path": "D:/Works/tortuga-home/node_modules",
-    "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": "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;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/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" />
@@ -1204,14 +1207,13 @@
       <workItem from="1677676568616" duration="586000" />
       <workItem from="1679405668871" duration="1633000" />
       <workItem from="1679580438958" duration="5571000" />
-      <workItem from="1680507043535" duration="668000" />
-    </task>
-    <task id="LOCAL-00500" summary=".">
-      <created>1640788248689</created>
-      <option name="number" value="00500" />
-      <option name="presentableId" value="LOCAL-00500" />
-      <option name="project" value="LOCAL" />
-      <updated>1640788248690</updated>
+      <workItem from="1680507043535" duration="677000" />
+      <workItem from="1681905578120" duration="610000" />
+      <workItem from="1683535963609" duration="370000" />
+      <workItem from="1685817600522" duration="1168000" />
+      <workItem from="1687000958068" duration="1421000" />
+      <workItem from="1687160328629" duration="978000" />
+      <workItem from="1687258922316" duration="610000" />
     </task>
     <task id="LOCAL-00501" summary=".">
       <created>1641578230504</created>
@@ -1549,7 +1551,14 @@
       <option name="project" value="LOCAL" />
       <updated>1679587451319</updated>
     </task>
-    <option name="localTasksCounter" value="549" />
+    <task id="LOCAL-00549" summary=".">
+      <created>1680507757929</created>
+      <option name="number" value="00549" />
+      <option name="presentableId" value="LOCAL-00549" />
+      <option name="project" value="LOCAL" />
+      <updated>1680507757929</updated>
+    </task>
+    <option name="localTasksCounter" value="550" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1579,6 +1588,17 @@
     <MESSAGE value="." />
     <option name="LAST_COMMIT_MESSAGE" value="." />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="php">
+          <url>file://$PROJECT_DIR$/scripts/lib/lib.php</url>
+          <line>97</line>
+          <option name="timeStamp" value="1" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />
     <select />

diff --git a/config/dnsmasq.conf b/config/dnsmasq.conf
index f911c36238b071e7bd8df74c4cb96b58feb1a8f7..68721dd2ea6d452b38cf949e6f726b0c187890ee 100644 (file)
--- a/config/dnsmasq.conf
+++ b/config/dnsmasq.conf
@@ -13,7 +13,6 @@ address=/tvheadend.home.tortuga.enhydra.fr/192.168.13.60
 address=/domoticz.home.tortuga.enhydra.fr/192.168.13.67
 address=/nextcloud.home.tortuga.enhydra.fr/192.168.13.7
 address=/harmonyapi.home.tortuga.enhydra.fr/192.168.13.7
-address=/servarr.home.tortuga.enhydra.fr/192.168.13.70
 address=/potainersalon.home.tortuga.enhydra.fr/192.168.13.66
 address=/transmission.home.tortuga.enhydra.fr/192.168.13.7
 address=/paperless.home.tortuga.enhydra.fr/192.168.13.7

diff --git a/config/global.php b/config/global.php
index 3cd7449169ad775dc6cdacb90e2375facd3d0507..4869a48081c062cd88762ab60b891205167cfd89 100644 (file)
--- a/config/global.php
+++ b/config/global.php
@@ -23,7 +23,7 @@ define('NAS_PWD_ROOT', 'smb://Share:RQpZHMDLtbc229FQV3@192.168.13.1/1.42.6-25556
 
 $squeezeboxPlayers = array(
     'Cave' => 'b8:27:eb:ab:b4:50',
-    'Salle de bains' => '9f:e3:5d:6e:15:35',
+    'Salle de bains' => '8b:42:ec:ef:38:39',
     //'Salon' => 'dc:a6:32:02:47:c1',
     //'Salon' => 'cc:cc:2d:15:82:0e',
     //'Salon' => '5a:a1:4c:5c:e7:5e',

diff --git a/config/rooms.php b/config/rooms.php
index 301cc28d3f354f8ae9355d4c2d68b1696d634b26..b80261cf81818781d9bc311cd39bbcabeb20b3a4 100644 (file)
--- a/config/rooms.php
+++ b/config/rooms.php
@@ -61,6 +61,7 @@ function salon()
     $favorites = [
         ['type' => 'light', 'scene' => 'salon/auto', 'label' => 'Allumer'],
         ['type' => 'light', 'scene' => 'salon/off', 'label' => 'éteindre'],
+        ['type' => 'light', 'scene' => 'salon/day', 'label' => 'journée'],
         ['type' => 'light', 'scene' => 'salon/lumineux', 'label' => 'lumineux'],
         ['type' => 'light', 'scene' => 'salon/cinema', 'label' => 'cinéma'],
         ['type' => 'light', 'scene' => 'salon/cineclub', 'label' => 'cinéma de minuit'],

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index aa44366f8578f5b4c0dd3c10db7e9607e28a5ead..703ca368338f3ef2d80a027d3423441cad79d6f6 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -12,7 +12,6 @@ $bureau = 13;
 $sdb = 14;
 $cour = 11;
 
-$sdb_ampli = 18;
 $freebox = 19;
 
 $litvincent = 9;
@@ -21,7 +20,9 @@ $bedlowscreenbrightness = 12;
 $home = 15;
 $alert = 16;
 
-$chambrefan = 4616;
+$chambrefan = 6952;
+$amplisdb = 6956;
+$bar = 6985;
 
 $scenes = [
        'chambre/matin' => [
@@ -339,13 +340,13 @@ $scenes = [
                ['type' => 'function', 'function' => 'salonAuto', 'args' => [true]],
        ],
        'salon/bar/on' => [
-               ['type' => 'domoticz', 'device' => 6887, 'command' => true, 'priority' => true],
+               ['type' => 'domoticz', 'device' => $bar, 'command' => true, 'priority' => true],
        ],
        'salon/bar/off' => [
-               ['type' => 'domoticz', 'device' => 6887, 'command' => false, 'priority' => true],
+               ['type' => 'domoticz', 'device' => $bar, 'command' => false, 'priority' => true],
        ],
        'salon/bar/toggle' => [
-               ['type' => 'domoticz', 'device' => 6887, 'command' => 'Toggle', 'priority' => true],
+               ['type' => 'domoticz', 'device' => $bar, 'command' => 'Toggle', 'priority' => true],
        ],
        'salon/day' => [
                ['type' => 'domoticz', 'scene' => 45, 'command' => true, 'priority' => true],
@@ -353,6 +354,7 @@ $scenes = [
                ['type' => 'state', 'key' => 'salon', 'value' => 'on'],
                ['type' => 'scene', 'scene' => 'cuisine/on', 'delay' => 1],
                ['type' => 'scene', 'scene' => 'salon/cheminee', 'delay' => 1],
+               ['type' => 'scene', 'scene' => 'salon/bar/on'],
        ],
        'salon/lumineux' => [
                ['type' => 'domoticz', 'scene' => 51, 'command' => true, 'priority' => true],
@@ -360,6 +362,7 @@ $scenes = [
                ['type' => 'state', 'key' => 'salon', 'value' => 'on'],
                ['type' => 'scene', 'scene' => 'cuisine/on', 'delay' => 1],
                ['type' => 'scene', 'scene' => 'salon/cheminee', 'delay' => 1],
+               ['type' => 'scene', 'scene' => 'salon/bar/on'],
        ],
        'salon/off' => [
                ['type' => 'function', 'function' => 'salonAuto', 'args' => [false]],
@@ -406,6 +409,7 @@ $scenes = [
                // ['type' => 'insteon', 'command' => '0?1130=I=0=0'],
                ['type' => 'function', 'function' => 'chemineeOn', 'args' => ['salon', 'fire', 0.8]],
                ['type' => 'scene', 'scene' => 'cuisine/on', 'repeat' => 2],
+               ['type' => 'scene', 'scene' => 'salon/bar/on'],
        ],
        'salon/theatre' => [
                ['type' => 'ecomode', 'mode' => '0'],
@@ -767,10 +771,10 @@ $scenes = [
                ['type' => 'domoticz', 'device' => '6449', 'command' => false, 'priority' => true],
        ],
        'sdb/ampli/on' => [
-               ['type' => 'domoticz', 'device' => '476', 'command' => true, 'priority' => true],
+               ['type' => 'domoticz', 'device' => $amplisdb, 'command' => true, 'priority' => true],
        ],
        'sdb/ampli/off' => [
-               ['type' => 'domoticz', 'device' => '476', 'command' => false, 'priority' => true],
+               ['type' => 'domoticz', 'device' => $amplisdb, 'command' => false, 'priority' => true],
        ],
        'sdb/hotwater/auto' => [
                ['type' => 'function', 'function' => 'hotwaterAutoMode', 'args' => ['1']],
@@ -1081,7 +1085,7 @@ function planetarium($on) {
 }
 
 function checkPlanetarium($periodicOffCheck = true) {
-       $device = 4617;
+       $device = 6989;
 
        $on = getState('planetarium') == '1';
        $h = date('G');