.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 406367f63a6837e34b3ccae3cc2aeac067bc9e49..72f4855ca83a74b20485dcba769265ec6f5b85b8 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,65 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change afterPath="$PROJECT_DIR$/images/earth.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/suncurve.png" afterDir="false" />
       <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$/config/cave.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/cave.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/cuisine.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/cuisine.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/global.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/global.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/salon.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/salon.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/sdb.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/sdb.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/settings.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/settings.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/wc.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/wc.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/app_token" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/app_token" 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/domoticz_status.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/domoticz_status.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/freeboxapi.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/freeboxapi.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/gradient.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/gradient.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/import.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/import.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/domoticz.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/domoticz.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/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/http.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/http.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/kodi.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/kodi.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/lib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/lib.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/pc.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/pc.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/proc.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/proc.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/profile.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/profile.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/router.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/router.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/lib/ssh.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/ssh.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/tmdb.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/tmdb.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/weatherstation.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/weatherstation.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/mediarasp.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/mediarasp.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/shield.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/shield.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/sleeppc.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/sleeppc.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/squeeze.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/squeeze.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/squeezeplayerstatus.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/squeezeplayerstatus.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/servers/_startdaemon.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/_startdaemon.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/servers/domoticz.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/domoticz.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/servers/hue.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/hue.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/servers/logcat.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/logcat.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/servers/logcatb.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/logcatb.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/servers/logcats.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/logcats.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/servers/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/squeezebox.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/servers/ssh.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/ssh.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/style/gradient.css" beforeDir="false" afterPath="$PROJECT_DIR$/style/gradient.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/style/gradient.less" beforeDir="false" afterPath="$PROJECT_DIR$/style/gradient.less" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/style/style.less" beforeDir="false" afterPath="$PROJECT_DIR$/style/style.less" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/style/weatherstation.css" beforeDir="false" afterPath="$PROJECT_DIR$/style/weatherstation.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/style/weatherstation.less" beforeDir="false" afterPath="$PROJECT_DIR$/style/weatherstation.less" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1104,14 +1048,7 @@
       <workItem from="1622787397330" duration="3950000" />
       <workItem from="1638959846647" duration="5250000" />
       <workItem from="1638973361360" duration="1389000" />
-      <workItem from="1639125380760" duration="5173000" />
-    </task>
-    <task id="LOCAL-00443" summary=".">
-      <created>1611911651461</created>
-      <option name="number" value="00443" />
-      <option name="presentableId" value="LOCAL-00443" />
-      <option name="project" value="LOCAL" />
-      <updated>1611911651461</updated>
+      <workItem from="1639125380760" duration="7763000" />
     </task>
     <task id="LOCAL-00444" summary=".">
       <created>1612025352669</created>
@@ -1449,7 +1386,14 @@
       <option name="project" value="LOCAL" />
       <updated>1639181242355</updated>
     </task>
-    <option name="localTasksCounter" value="492" />
+    <task id="LOCAL-00492" summary=".">
+      <created>1639205467698</created>
+      <option name="number" value="00492" />
+      <option name="presentableId" value="LOCAL-00492" />
+      <option name="project" value="LOCAL" />
+      <updated>1639205467698</updated>
+    </task>
+    <option name="localTasksCounter" value="493" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php
index ac1ddd3127a6917bc346698b9d07d3f9041416cc..42d0bc7a2e984483bb5015582f7ad8d93bcf8d1b 100644 (file)
--- a/scripts/cron/cron.php
+++ b/scripts/cron/cron.php
@@ -237,9 +237,9 @@ function cronWeather($cronmin)
     $res['outdoor_temp'] = toNumber(getDomoticzDeviceStatus(1467), 1);
     $res['outdoor_humidity'] = toNumber(getDomoticzDeviceStatus(1026), true);
     $res['outdoor_pressure'] = toNumber(getDomoticzDeviceStatus(1027), true);
-    $res['backyard_temp'] = toNumber(getDomoticzDeviceStatus(1025), 1);
-    $res['backyard_humidity'] = toNumber(getDomoticzDeviceStatus(1026), true);
-    $res['backyard_pressure'] = toNumber(getDomoticzDeviceStatus(1027), true);
+    $res['backyard_temp'] = toNumber(getDomoticzDeviceStatus(6840), 1);
+    $res['backyard_humidity'] = toNumber(getDomoticzDeviceStatus(6841), true);
+    $res['backyard_pressure'] = toNumber(getDomoticzDeviceStatus(6842), true);
     $res['bathroom_temp'] = toNumber(getDomoticzDeviceStatus(1346), 1);
     $res['bathroom_humidity'] = toNumber(getDomoticzDeviceStatus(1347), true);
     $res['bedroom_temp'] = toNumber(getDomoticzDeviceStatus(1356), 1);

diff --git a/scripts/domoticz_device_event.php b/scripts/domoticz_device_event.php
index 5324b71eb8f42ccf90b67cd0d8ed3e3a082f493f..e3f4bf25819bea255e3511d85fe6baff68834417 100644 (file)
--- a/scripts/domoticz_device_event.php
+++ b/scripts/domoticz_device_event.php
@@ -3,10 +3,12 @@
 define('TIMELIMIT', 1);
 $_GET['im'] = '5';
 
+$wcswitch = 6448;
+
 if ($_GET['device'] == 4680 || $_GET['device'] == 1476 || $_GET['device'] == 1478 || $_GET['device'] == 4955) {
     $forceConfig = 'salon';
 }
-if ($_GET['device'] == 1695) {
+if ($_GET['device'] == $wcswitch) {
     $forceConfig = 'wc';
 }
 if ($_GET['device'] == 4600) {
@@ -18,6 +20,7 @@ if ($_GET['device'] == 4711) {
 
 require_once "import.php";
 
+
 if ($_GET['device'] == 480) {
     chambreToggle();
 } else if ($_GET['device'] == 4680 || $_GET['device'] == 1476 || $_GET['device'] == 1478 || $_GET['device'] == 4955) {
@@ -53,7 +56,7 @@ if ($_GET['device'] == 480) {
     }
 } else if ($_GET['device'] == 1451) {
     domoticzSwitch(1450);
-} else if ($_GET['device'] == 1695) {
+} else if ($_GET['device'] == $wcswitch) {
     $forceConfig = 'wc';
     switch ($_GET['state']) {
         case 'Double_Click':