.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2ffe36dee4e29c970667b634991b687d76c101fb..f735ede5c01a0d6848c3af806d3f598f5575708f 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,21 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/bureau.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/bureau.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/domoticz_device_event.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/domoticz_device_event.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/freebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/freebox.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/harmony.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/harmony.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/hue.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/hue.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/mediarasp.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/mediarasp.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/off.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/off.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/shield.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/shield.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$/scripts/pcgames.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/pcgames.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/share.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/share.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/squeeze.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/squeeze.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/servers/logcat.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/logcat.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -954,14 +941,7 @@
       <workItem from="1611336541554" duration="1485000" />
       <workItem from="1611428507149" duration="1044000" />
       <workItem from="1611582691581" duration="2261000" />
-      <workItem from="1611585304162" duration="581000" />
-    </task>
-    <task id="LOCAL-00388" summary=".">
-      <created>1605188139134</created>
-      <option name="number" value="00388" />
-      <option name="presentableId" value="LOCAL-00388" />
-      <option name="project" value="LOCAL" />
-      <updated>1605188139134</updated>
+      <workItem from="1611585304162" duration="1328000" />
     </task>
     <task id="LOCAL-00389" summary=".">
       <created>1605261980841</created>
@@ -1299,7 +1279,14 @@
       <option name="project" value="LOCAL" />
       <updated>1611337927836</updated>
     </task>
-    <option name="localTasksCounter" value="437" />
+    <task id="LOCAL-00437" summary=".">
+      <created>1611585903595</created>
+      <option name="number" value="00437" />
+      <option name="presentableId" value="LOCAL-00437" />
+      <option name="project" value="LOCAL" />
+      <updated>1611585903596</updated>
+    </task>
+    <option name="localTasksCounter" value="438" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php
index b4f8ee19c0181dbf4ed5c4fccd73fe8b721faa51..d32d58e0314d73b0fb0f92d3724937bf4d97d558 100644 (file)
--- a/scripts/cron/cron.php
+++ b/scripts/cron/cron.php
@@ -384,14 +384,13 @@ function cronHarmony($cronmin)
         setPlaying('squeezebox', 'bureau');
     } else if ($currentActivity == 'poweroff' || $currentActivity == 'off') {
         setPlaying('mycanal', 'bureau');
-        harmonyDeviceCommand('sony-projecteur', 'power-off');
     }
 
-    if ($currentActivity === 'poweroff' || $currentActivity === 'off' || $currentActivity === 'musique') {
-        harmonyDeviceCommand('sony-projecteur', 'power-off');
-    } else {
-        harmonyDeviceCommand('sony-projecteur', 'power-on');
-    }
+//    if ($currentActivity === 'poweroff' || $currentActivity === 'off' || $currentActivity === 'musique') {
+//        harmonyDeviceCommand('sony-projecteur', 'power-off');
+//    } else {
+//        harmonyDeviceCommand('sony-projecteur', 'power-on');
+//    }
 }
 
 function cronHeartbeat($cronmin)

diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php
index 84aa867247d952d95993f31dfe49f94853e2c5fd..c7c25fb4d380a8a23bdb5b876d316b78a6b05f87 100644 (file)
--- a/scripts/lib/squeezebox.php
+++ b/scripts/lib/squeezebox.php
@@ -132,12 +132,13 @@ function squeezePlayByName($musicName, $player, $volume = null, $playIfSync = tr
 
     if ($player == $squeezeboxPlayers['Salon']) {
         setState('maskShieldSalonWakeup', '1');
-
+        shieldRunAppAndBackHome('sbplayer', 'salon', 1, false);
     } else if ($player == $squeezeboxPlayers['Salle de bains']) {
         execScene('sdb/ampli/on');
     } else if ($player == $squeezeboxPlayers['Bureau']) {
         harmonyActivity('musique');
         setState('maskShieldBureauWakeup', '1');
+        shieldRunAppAndBackHome('sbplayer', 'bureau', 1, false);
     } else if ($player == $squeezeboxPlayers['Chambre']) {
         denon(true);
     }