.

diff --git a/.docker/dockerterminal.bat b/.docker/dockerterminal.bat
index 420ea09d9665f2af3f8ad4fac935bbf7f09c507b..b7a7a2155231226b29f81b3307e0ac9f6de264b1 100644 (file)
--- a/.docker/dockerterminal.bat
+++ b/.docker/dockerterminal.bat
@@ -1,3 +1,3 @@
 @echo off
 cls
-C:\tools\cygwin\bin\ssh.exe -tt root@192.168.13.7 'docker exec -it -u root tortugahome /bin/bash'
+C:\tools\cygwin\bin\ssh.exe -tt root@192.168.13.6 'docker exec -it -u root tortugahome /bin/bash'

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index feeb202875897c7cc74465b0d1bfd67aeeee1f18..523756f4c3ea37bff7c59b1add8343f331c19da9 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,10 +5,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
+      <change beforePath="$PROJECT_DIR$/.docker/dockerterminal.bat" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/dockerterminal.bat" 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/ecomode.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/ecomode.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" />
+      <change beforePath="$PROJECT_DIR$/config/global.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/global.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/denon.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/denon.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/squeezebox.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -279,7 +280,7 @@
       <recent name="T:\Drive\Works\home\images\rooms" />
     </key>
   </component>
-  <component name="RunManager" selected="Shell Script.Update DNS">
+  <component name="RunManager" selected="Shell Script.Docker terminal">
     <configuration default="true" type="Applet">
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
       <method v="2">
@@ -1267,7 +1268,8 @@
       <workItem from="1690896094427" duration="1950000" />
       <workItem from="1690907942122" duration="34000" />
       <workItem from="1690910375137" duration="580000" />
-      <workItem from="1691748561800" duration="648000" />
+      <workItem from="1691748561800" duration="1265000" />
+      <workItem from="1691844371156" duration="2578000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1612,7 +1614,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="585" />
+    <option name="localTasksCounter" value="586" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/global.php b/config/global.php
index 8abf8596bc59262c46fce6fd3e4e6585c8d4d365..3eff0d1c09cdc6dce9a99ba982f13140879492da 100644 (file)
--- a/config/global.php
+++ b/config/global.php
@@ -24,23 +24,13 @@ 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' => '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',
-    'Salon' => 'bb:bb:b1:c8:92:09',
-    //'Salon' => '00:04:20:17:82:8b',
     'Chambre' => 'b8:27:eb:31:e1:44',
-    //'WC' => '00:04:20:2a:05:2e',
-    //'WC' => 'b8:27:eb:78:f6:88',
-    // 'WC' => 'a6:ce:85:78:33:a4',
-    //'Cuisine' => 'b8:27:eb:ec:71:34',
     'Cuisine' => '00:04:20:2a:05:2e',
     'Lit Jérôme' => 'b8:27:eb:62:d3:ce',
     'Lit Vincent' => 'b8:27:eb:40:0e:e9',
     'WC' => 'b8:27:eb:f6:1d:30',
-    //'Bureau' => 'cc:cc:2d:2a:b5:35',
-    //'Bureau' => 'd6:12:01:da:63:f9',
-    'Bureau' => '00:04:20:17:82:8b',
+    'Salon' => '00:04:20:17:82:8b',
+    'Bureau' => 'dc:a6:32:50:70:42',
 );
 
 

diff --git a/scripts/lib/denon.php b/scripts/lib/denon.php
index 0dd243a638ce5cec7620ebb28240d012b51f5cc8..871f8223e669d0a4a62f22da62fff65911050f2c 100644 (file)
--- a/scripts/lib/denon.php
+++ b/scripts/lib/denon.php
@@ -57,7 +57,7 @@ function denonAVRInput($input, $setvolume = false)
     }
 
     if ($setvolume) {
-        $volumes = ['Media Player' => 60, 'Game' => 50, 'HEOS Music' => 40, 'CD' => 30, 'AUX' => 26];
+        $volumes = ['Media Player' => 60, 'Game' => 50, 'HEOS Music' => 40, 'CD' => 30, 'AUX' => 30];
         if (isset($volumes[$input])) {
             for ($i = 0; $i <= 2; $i++) {
                 denonAVRVolume($volumes[$input], '');
@@ -66,7 +66,7 @@ function denonAVRInput($input, $setvolume = false)
         }
     }
 
-    $audioMode = ['Media Player' => 'DOLBY DIGITAL', 'AUX' => 'DOLBY DIGITAL', 'CD' => 'DOLBY DIGITAL', 'Game' => 'DOLBY DIGITAL', 'HEOS Music' => 'MULTI CH IN 7.1'];
+    $audioMode = ['Media Player' => 'DOLBY DIGITAL', 'AUX' => 'MULTI CH IN 7.1', 'CD' => 'DOLBY DIGITAL', 'Game' => 'DOLBY DIGITAL', 'HEOS Music' => 'MULTI CH IN 7.1'];
     if (isset($audioMode[$input])) {
         for ($i = 0; $i <= 2; $i++) {
             denonAVRSetAudioMode($audioMode[$input]);

diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php
index ad9fab8c4d5eeb348d90eca9f14ae7ec0a2a271f..94687c883840fa127a95ddb2ee9f8db8f30d70d8 100644 (file)
--- a/scripts/lib/squeezebox.php
+++ b/scripts/lib/squeezebox.php
@@ -2,6 +2,8 @@
 
 require_once ROOT . '/config/music.php';
 
+const DENON_SQUEEZEBOX_INPUT = 'AUX';
+
 function stopSqueezeboxPlayer($player, $stopIfSync = true, $devices = true)
 {
     if (!$stopIfSync && isSynced($player)) {
@@ -157,11 +159,11 @@ function squeezePlayerOn($player)
     $player = _player($player);
     if ($player == $squeezeboxPlayers['Salon']) {
         $state = denonAVRGetPowerState();
-        denonAVROn('HEOS Music', false);
+        denonAVROn(DENON_SQUEEZEBOX_INPUT, false);
         sleep(4);
         if (!$state) {
             denonAVROff();
-            denonAVROn('HEOS Music', true);
+            denonAVROn(DENON_SQUEEZEBOX_INPUT, true);
         }
     } else if ($player == $squeezeboxPlayers['Salle de bains']) {
         execScene('sdb/ampli/on');