.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e1288fa32ac8ddf835efeec522b42c83f2fab06f..6b47c148c31ef613467e9967d2321c775ce6c29d 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,11 +3,9 @@
   <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$/scripts/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.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/flowerpower.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/flowerpower.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/remoteinfos.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/remoteinfos.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" />
@@ -925,21 +923,10 @@
       <workItem from="1607546452054" duration="634000" />
       <workItem from="1607872973632" duration="1438000" />
       <workItem from="1607932840253" duration="5614000" />
-      <workItem from="1607945700829" duration="1423000" />
-    </task>
-    <task id="LOCAL-00374" summary=".">
-      <created>1604568864147</created>
-      <option name="number" value="00374" />
-      <option name="presentableId" value="LOCAL-00374" />
-      <option name="project" value="LOCAL" />
-      <updated>1604568864148</updated>
-    </task>
-    <task id="LOCAL-00375" summary=".">
-      <created>1604568925231</created>
-      <option name="number" value="00375" />
-      <option name="presentableId" value="LOCAL-00375" />
-      <option name="project" value="LOCAL" />
-      <updated>1604568925231</updated>
+      <workItem from="1607945700829" duration="1640000" />
+      <workItem from="1608294874717" duration="62000" />
+      <workItem from="1608294975826" duration="1188000" />
+      <workItem from="1609367639356" duration="590000" />
     </task>
     <task id="LOCAL-00376" summary=".">
       <created>1604828767680</created>
@@ -1270,7 +1257,21 @@
       <option name="project" value="LOCAL" />
       <updated>1607938357925</updated>
     </task>
-    <option name="localTasksCounter" value="423" />
+    <task id="LOCAL-00423" summary=".">
+      <created>1608196291044</created>
+      <option name="number" value="00423" />
+      <option name="presentableId" value="LOCAL-00423" />
+      <option name="project" value="LOCAL" />
+      <updated>1608196291044</updated>
+    </task>
+    <task id="LOCAL-00424" summary=".">
+      <created>1608294905553</created>
+      <option name="number" value="00424" />
+      <option name="presentableId" value="LOCAL-00424" />
+      <option name="project" value="LOCAL" />
+      <updated>1608294905554</updated>
+    </task>
+    <option name="localTasksCounter" value="425" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

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

diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php
index 4fbdcdee67fd78876b3086db6c0bda81309da964..fb7b1f673f9f42756b273d17aafa0579abb8d9db 100644 (file)
--- a/scripts/lib/squeezebox.php
+++ b/scripts/lib/squeezebox.php
@@ -201,7 +201,6 @@ function getSqueezeFavorites($root = 0, $app = 'favorites', $level = 0)
 
     if (is_array($loop)) {
         if ($app == 'podcasts' && $level != 0 && count(explode('.', $loop[0]['id'])) <= 2) {
-            echo "Lost root \n";
             return getSqueezeFavorites(0, $app, 0);
         }
 

diff --git a/servers/logcat.php b/servers/logcat.php
index 90344a0c8538e36f217bf9c1251d56d170c54474..f61b5dd7383e5ec5b2af7428b7b0309fe484d1f4 100644 (file)
--- a/servers/logcat.php
+++ b/servers/logcat.php
@@ -26,7 +26,7 @@ $cases = [
         if (getState($state, '0') == '1') {
             setState($state, '0');
         } else {
-            if (getSqueezePlayerStatus($squeezePlayer) === 0) {
+            if (getSqueezePlayerStatus($squeezePlayer) <= 0) {
                 shieldRunActivity($device);
             } else {
                 execScene('bureau/sound/on');