.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c09de2fbb8e78b0b93c4dcb6141a189000e564e3..adc8bbeac823709a13d7595fc391208af2531f44 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +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$/scripts/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/ecomode.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/ecomode.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/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -816,14 +816,7 @@
       <workItem from="1583062693000" duration="3344000" />
       <workItem from="1583265992507" duration="1990000" />
       <workItem from="1583403852883" duration="5927000" />
-      <workItem from="1583566881341" duration="609000" />
-    </task>
-    <task id="LOCAL-00263" summary=".">
-      <created>1578039845044</created>
-      <option name="number" value="00263" />
-      <option name="presentableId" value="LOCAL-00263" />
-      <option name="project" value="LOCAL" />
-      <updated>1578039845044</updated>
+      <workItem from="1583566881341" duration="2690000" />
     </task>
     <task id="LOCAL-00264" summary=".">
       <created>1578040654852</created>
@@ -1161,7 +1154,14 @@
       <option name="project" value="LOCAL" />
       <updated>1583566913949</updated>
     </task>
-    <option name="localTasksCounter" value="312" />
+    <task id="LOCAL-00312" summary=".">
+      <created>1583567632871</created>
+      <option name="number" value="00312" />
+      <option name="presentableId" value="LOCAL-00312" />
+      <option name="project" value="LOCAL" />
+      <updated>1583567632871</updated>
+    </task>
+    <option name="localTasksCounter" value="313" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1217,12 +1217,12 @@
     </state>
     <state x="720" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577298128269" />
     <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1583062669525" />
-    <state x="935" y="114" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1583566907024">
+    <state x="935" y="114" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1583567625532">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="701" y="114" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1577381105204" />
     <state x="701" y="127" width="1170" height="972" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1582220569877" />
-    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1583566907024" />
+    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1583567625532" />
     <state x="92" y="92" width="2376" height="856" key="DiffContextDialog" timestamp="1580377344165">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1242,12 +1242,12 @@
     <state x="732" y="343" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577380394903" />
     <state x="732" y="383" key="com.intellij.ide.util.TipDialog/0.0.1920.1160@0.0.1920.1160" timestamp="1582201881167" />
     <state x="980" y="343" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1583566899074" />
-    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1583567602832">
+    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1583567783060">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="732" y="257" width="607" height="536" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1577380471547" />
     <state x="733" y="287" width="607" height="598" key="find.popup/0.0.1920.1160@0.0.1920.1160" timestamp="1582125776502" />
-    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1583567602832" />
+    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1583567783060" />
     <state x="936" y="240" key="run.anything.popup" timestamp="1578386519646">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>

diff --git a/scripts/domoticz_device_event.php b/scripts/domoticz_device_event.php
index 589a8aa979ee1cb3a8ba50bebc8bc57b51b3936f..6da91adcacbcc89f40d8b341cc62311df8c54612 100644 (file)
--- a/scripts/domoticz_device_event.php
+++ b/scripts/domoticz_device_event.php
@@ -49,5 +49,7 @@ if ($_GET['device'] == 480) {
         default:
             break;
     }
+}else if($_GET['device']==1451){
+    domoticzSwitch(1450);
 }
 echo '1';
\ No newline at end of file

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 0b8467bced988e59ce02e17740d62916fa72547b..2d95a241857449ae06d60f7d97eca8abd626df61 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -42,12 +42,6 @@ $scenes = [
     'chambre/deshumidificateur/off' => [
         ['type' => 'domoticz', 'device' => '1062', 'command' => false],
     ],
-    'chambre/raspberry/on' => [
-        ['type' => 'insteon', 'command' => '0?1138=I=0=0'],
-    ],
-    'chambre/raspberry/off' => [
-        ['type' => 'insteon', 'command' => '0?1338=I=0=0'],
-    ],
     'chambre/auto' => [
         ['type' => 'nightmode', 'mode' => '0'],
         ['type' => 'function', 'function' => 'chambreAuto', 'args' => [true]],
@@ -554,7 +548,6 @@ $scenes = [
     ],
     'ecomode/basic' => [
         ['type' => 'scene', 'scene' => 'sdb/ampli/off'],
-        ['type' => 'scene', 'scene' => 'chambre/raspberry/off'],
         ['type' => 'domoticz', 'device' => '1', 'switchtype' => 'scene', 'command' => false],
     ],
     'ecomode/super' => [
@@ -570,7 +563,6 @@ $scenes = [
     ],
     'ecomode/off' => [
         ['type' => 'scene', 'scene' => 'ecomode/notsuper'],
-        ['type' => 'scene', 'scene' => 'chambre/raspberry/on', 'when' => ['night' => 0]],
         ['type' => 'domoticz', 'device' => '1', 'switchtype' => 'scene', 'command' => true, 'priority' => false],
     ],
 ];
@@ -725,18 +717,20 @@ function planetarium($on)
 
 function checkPlanetarium($periodicOffCheck = true)
 {
+    $device = 1452;
+
     $on = getState('planetarium') == '1';
     if ($on) {
         if ($periodicOffCheck) {
             $min = intval(date('i'));
             if ($min % 30 == 0) {
-                insteonCommand('3?026221A6DE0F1300=I=3');
+                domoticzSwitch($device, false);
                 sleep(5);
             }
         }
-        insteonCommand('3?026221A6DE0F11FF=I=3');
+        domoticzSwitch($device, true);
     } else {
-        insteonCommand('3?026221A6DE0F1300=I=3');
+        domoticzSwitch($device, false);
     }
 }