.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bb1640750d50946db3c9b443eabb7f6d7583cd3c..ecd02cd3688dbd751cef9ce21317dc14ce2e6a0b 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change afterPath="$PROJECT_DIR$/scripts/squeezeplayerstatus.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/lib/shield.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/shield.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/flowerpower.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/flowerpower.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/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/squeezebox.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/servers/logcat.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/logcat.php" afterDir="false" />
     </list>
@@ -271,6 +272,17 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
+      <option name="arquillianRunConfiguration">
+        <value>
+          <option name="containerStateName" value="" />
+        </value>
+      </option>
+      <option name="TEST_OBJECT" value="class" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration default="true" type="ArquillianTestNG" factoryName="">
       <option name="arquillianRunConfiguration">
         <value>
@@ -919,14 +931,8 @@
       <workItem from="1606937045400" duration="5193000" />
       <workItem from="1607036021292" duration="44000" />
       <workItem from="1607084835284" duration="6328000" />
-      <workItem from="1607323219546" duration="8824000" />
-    </task>
-    <task id="LOCAL-00370" summary=".">
-      <created>1604414629025</created>
-      <option name="number" value="00370" />
-      <option name="presentableId" value="LOCAL-00370" />
-      <option name="project" value="LOCAL" />
-      <updated>1604414629025</updated>
+      <workItem from="1607323219546" duration="11053000" />
+      <workItem from="1607439614302" duration="1182000" />
     </task>
     <task id="LOCAL-00371" summary=".">
       <created>1604477496171</created>
@@ -1264,7 +1270,14 @@
       <option name="project" value="LOCAL" />
       <updated>1607330684348</updated>
     </task>
-    <option name="localTasksCounter" value="419" />
+    <task id="LOCAL-00419" summary=".">
+      <created>1607418039594</created>
+      <option name="number" value="00419" />
+      <option name="presentableId" value="LOCAL-00419" />
+      <option name="project" value="LOCAL" />
+      <updated>1607418039594</updated>
+    </task>
+    <option name="localTasksCounter" value="420" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/global.php b/config/global.php
index a55cc153c424d8f7a49ce788d31786561fde01b6..1549b8fc108b2548ad8cade1f0b4e69d04b03731 100644 (file)
--- a/config/global.php
+++ b/config/global.php
@@ -16,7 +16,8 @@ define('LONGITUDE', 2.3422104);
 $squeezeboxPlayers = array(
     'Salle de bains' => 'b8:27:eb:ab:b4:50',
     //'Salon' => 'dc:a6:32:02:47:c1',
-    'Salon' => 'cc:cc:2d:15:82:0e',
+    //'Salon' => 'cc:cc:2d:15:82:0e',
+    'Salon' => '5a:a1:4c:5c:e7:5e',
     'Chambre' => 'b8:27:eb:31:e1:44',
     'WC' => '00:04:20:2a:05:2e',
     'Cuisine' => 'b8:27:eb:ec:71:34',

diff --git a/scripts/lib/flowerpower.php b/scripts/lib/flowerpower.php
index a786917c45d6e90a659905b5bb2cba5cf4799c7c..719dd8c364181727c25c710841aa34ae1824b699 100644 (file)
--- a/scripts/lib/flowerpower.php
+++ b/scripts/lib/flowerpower.php
@@ -1,9 +1,13 @@
 <?php
 function updateFlowerPower()
 {
-    $fp = explode("\n", trim(`sudo /usr/local/bin/flowerpower`));
+    $device = getState('device_bureausun_awake') ? 'bureausun' : 'cerveau';
+    echo $device . "\n";
+    $res = sshRunCommand('/usr/local/bin/flowerpower', $device, true, true);
+    print_r($res);
+    $fp = explode("\n", $res['output']);
     print_r($fp);
-    $map = [2 => 1467, 0 => 1468];
+    $map = [1 => 1467, 0 => 1468];
     foreach ($map as $k => $v) {
         $newValue = $fp[$k];
         if ($v === 1467) {

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index e61fe142cf093084703bf5577ddb6ae18f1af303..0a03301201552ade99b28a40ccaf0fcfa916bd39 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -487,18 +487,26 @@ $scenes = [
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'off'],
         ['type' => 'scene', 'scene' => 'bureau/sleeppc'],
     ],
+    'bureau/sound/on' => [
+        ['type' => 'domoticz', 'device' => 24, 'switchtype' => 'scene', 'command' => true, 'priority' => true],
+    ],
+    'bureau/sound/off' => [
+        ['type' => 'domoticz', 'device' => 24, 'switchtype' => 'scene', 'command' => false],
+    ],
     'bureau/media/play' => [
         ['type' => 'scene', 'scene' => 'bureau/screen/down'],
         ['type' => 'scene', 'scene' => 'bureau/rideaux/close'],
         ['type' => 'scene', 'scene' => 'bureau/off'],
         ['type' => 'function', 'function' => 'bureauAuto', 'args' => [false]],
         ['type' => 'ir', 'room' => 'bureausun', 'device' => 'Projector', 'command' => 'PowerOn'],
+        ['type' => 'scene', 'scene' => 'bureau/sound/on'],
     ],
     'bureau/media/stop' => [
         ['type' => 'scene', 'scene' => 'bureau/screen/up'],
         ['type' => 'scene', 'scene' => 'bureau/rideaux/open'],
         ['type' => 'scene', 'scene' => 'bureau/auto'],
         ['type' => 'ir', 'room' => 'bureausun', 'device' => 'Projector', 'command' => 'PowerOff'],
+        ['type' => 'scene', 'scene' => 'bureau/sound/off'],
     ],
     'bureau/screen/down' => [
         ['type' => 'domoticz', 'device' => '1', 'command' => true, 'priority' => true],

diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php
index e14bd84ebcfccb506c0806f6c93db6a8d73e8355..63efbaa8fdda8e75ee57a8fb5d0fcc05183b57c0 100644 (file)
--- a/scripts/lib/squeezebox.php
+++ b/scripts/lib/squeezebox.php
@@ -106,6 +106,7 @@ function squeezePlayByName($musicName, $player, $volume = null, $playIfSync = tr
     } else if ($player == $squeezeboxPlayers['Salle de bains']) {
         execScene('sdb/ampli/on');
     } else if ($player == $squeezeboxPlayers['Bureau']) {
+        exec('bureau/sound/on');
         setState('maskShieldBureauWakeup', '1');
     } else if ($player == $squeezeboxPlayers['Chambre']) {
         denon(true);
@@ -160,6 +161,7 @@ function isMacAddress($mac)
 function synchroSoiree()
 {
     harmonyActivity('musique');
+    exec('bureau/sound/on');
 
     $devices = ['WC', 'Chambre', 'Bureau', 'Cuisine'];
     $salon = _player('Salon');

diff --git a/servers/logcat.php b/servers/logcat.php
index 2371967ed560209b6f4d66a38122ce9837108e77..7ec133476a1e2268c3825686e71933a908881caf 100644 (file)
--- a/servers/logcat.php
+++ b/servers/logcat.php
@@ -28,6 +28,8 @@ $cases = [
         } else {
             if (!getSqueezePlayerStatus($squeezePlayer)) {
                 shieldRunActivity($device);
+            } else {
+                execScene('bureau/sound/on');
             }
         }
     },