From: Vincent <vincent@enhydra.fr>
Date: Sat, 24 Apr 2021 07:19:59 +0000 (+0200)
Subject: .
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=16bd59d3ec927c13da24c697f36b0d51bb417494;p=tortuga-home.git

.
---

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 984e413..89359c9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,11 +3,10 @@
   <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/homeconnect.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/homeconnect.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/homeconnect.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/homeconnect.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/remoteinfos.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/remoteinfos.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$/servers/domoticz.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/domoticz.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/salon.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/salon.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/js/home.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/home.js" 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/router.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/router.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -994,14 +993,9 @@
       <workItem from="1618656192286" duration="2313000" />
       <workItem from="1618682288258" duration="2117000" />
       <workItem from="1618740509693" duration="14198000" />
-      <workItem from="1618947923152" duration="1999000" />
-    </task>
-    <task id="LOCAL-00422" summary=".">
-      <created>1607938357925</created>
-      <option name="number" value="00422" />
-      <option name="presentableId" value="LOCAL-00422" />
-      <option name="project" value="LOCAL" />
-      <updated>1607938357925</updated>
+      <workItem from="1618947923152" duration="2016000" />
+      <workItem from="1619079821781" duration="1188000" />
+      <workItem from="1619120393111" duration="2277000" />
     </task>
     <task id="LOCAL-00423" summary=".">
       <created>1608196291044</created>
@@ -1339,7 +1333,14 @@
       <option name="project" value="LOCAL" />
       <updated>1618909856304</updated>
     </task>
-    <option name="localTasksCounter" value="471" />
+    <task id="LOCAL-00471" summary=".">
+      <created>1618989464530</created>
+      <option name="number" value="00471" />
+      <option name="presentableId" value="LOCAL-00471" />
+      <option name="project" value="LOCAL" />
+      <updated>1618989464530</updated>
+    </task>
+    <option name="localTasksCounter" value="472" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
diff --git a/config/salon.php b/config/salon.php
index b339380..9d9483c 100644
--- a/config/salon.php
+++ b/config/salon.php
@@ -8,7 +8,7 @@ config('VOLUME_DEVICE', 'DenonAVR');
 config('VIDEOPLAYER_DEVICE', 'salon');
 config('HIDEMASK_TIMEOUT', 250);
 config('THEME','#d0a25b');
-config('SLEEPSCREEN', 15);
+config('SLEEPSCREEN', 150);
 config('SCREENSAVER_BRIGHTNESS', 100);
 config('SLEEPTYPE', 'screensaver');
 config('SCREENSAVER','weatherstation');
diff --git a/js/home.js b/js/home.js
index 162973b..467046c 100644
--- a/js/home.js
+++ b/js/home.js
@@ -632,6 +632,10 @@ function updateScreenSaver(force) {
 }
 
 function showScreenSaver() {
+    if( $('main section:visible').data('section')==='remote'){
+        return;
+    }
+
     if (!$(".screensaver").is(':visible')) {
         updateScreenSaver(true);
         $(".screensaver").show();
diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php
index c80de8a..731b144 100644
--- a/scripts/cron/cron.php
+++ b/scripts/cron/cron.php
@@ -9,7 +9,7 @@ function cronOneLoop($cronmin)
     echo '------------------------------------' . "\n";
     _logSection('One Loop // ' . $cronmin);
     cronRooms($cronmin);
-    cronInsteon($cronmin);
+    //cronInsteon($cronmin);
     cronWeather($cronmin);
 
     if ($cronmin % 5 == 0) {
@@ -31,17 +31,15 @@ function cronOneLoop($cronmin)
         cronPing($cronmin);
     }
     if ($cronmin % 15 == 0) {
-        cronKodi($cronmin);
+        cronXPlanet($cronmin);
+        cronFlowerPower($cronmin);
+        cronPodcasts($cronmin);
         cronMediaLibrary($cronmin);
         cronTmdb($cronmin);
     }
     cronHarmony($cronmin);
     cronInterface($cronmin);
-    if ($cronmin % 15 == 0) {
-        cronXPlanet($cronmin);
-        cronFlowerPower($cronmin);
-        cronPodcasts($cronmin);
-    }
+
     if ($cronmin == 0) {
         cronEcoMode($cronmin);
     }
@@ -49,7 +47,10 @@ function cronOneLoop($cronmin)
         cronTranscode($cronmin);
     }
     cronHeartbeat($cronmin);
-    _logSection('End Loop');
+    if ($cronmin % 15 == 0) {
+        cronKodi($cronmin);
+    }
+    _logSection('End Loop (min:' . $cronmin . ')');
 }
 
 function cronXPlanet($cronmin)
@@ -65,12 +66,14 @@ function cronXPlanet($cronmin)
 
 function cronBackyard($cronmin)
 {
+    _logSection('Backyard');
     $device = 679;
     domoticzSwitch($device, getDomoticzDeviceStatus($device) === 'On');
 }
 
 function cronShield($cronmin)
 {
+    _logSection('Shield');
     global $devices;
     foreach ($devices as $device) {
         if (isset($device['shield'])) {
@@ -416,5 +419,6 @@ function cronHeartbeat($cronmin)
 
 function cronKodi($cronmin)
 {
+    _logSection('Kodi');
     kodiSyncPlayedStatus();
 }
\ No newline at end of file
diff --git a/scripts/lib/router.php b/scripts/lib/router.php
index 3f98228..eeb8445 100644
--- a/scripts/lib/router.php
+++ b/scripts/lib/router.php
@@ -2,7 +2,11 @@
 
 function routerDevicesList()
 {
-    $res = httpRequest('http://192.168.13.1/status-devices.asp', 'get', ['_' => time()], ['admin', 'BDQw479qbJST4u']);
+    try {
+        $res = httpRequest('http://192.168.13.1/status-devices.asp', 'get', ['_' => time()], ['admin', 'BDQw479qbJST4u']);
+    } catch (Exception $e) {
+        return [];
+    }
     // echo $res->getBody();
     if (preg_match('/dhcpd_lease = ([^;]+);/m', $res->getBody(), $dhcp)) {
         if (preg_match_all('/192\.168\.13\.[0-9]{1,3}/', $dhcp[1], $matches)) {