.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 06e19c799f9a87e75274d87f359b184e2b8afff2..eb8b4086b973fab41e209f011f266fb014ed7c7d 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,7 @@
   <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/lib/domoticz.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/domoticz.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" />
@@ -320,6 +321,7 @@
       <method v="2" />
     </configuration>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -850,14 +852,8 @@
       <workItem from="1595445984584" duration="630000" />
       <workItem from="1595520880245" duration="551000" />
       <workItem from="1595607894704" duration="2164000" />
-      <workItem from="1595786545513" duration="954000" />
-    </task>
-    <task id="LOCAL-00288" summary=".">
-      <created>1580462517759</created>
-      <option name="number" value="00288" />
-      <option name="presentableId" value="LOCAL-00288" />
-      <option name="project" value="LOCAL" />
-      <updated>1580462517759</updated>
+      <workItem from="1595786545513" duration="1752000" />
+      <workItem from="1596007424722" duration="1226000" />
     </task>
     <task id="LOCAL-00289" summary=".">
       <created>1580894931524</created>
@@ -1195,11 +1191,18 @@
       <option name="project" value="LOCAL" />
       <updated>1595786773234</updated>
     </task>
-    <option name="localTasksCounter" value="337" />
+    <task id="LOCAL-00337" summary=".">
+      <created>1595831538154</created>
+      <option name="number" value="00337" />
+      <option name="presentableId" value="LOCAL-00337" />
+      <option name="project" value="LOCAL" />
+      <updated>1595831538154</updated>
+    </task>
+    <option name="localTasksCounter" value="338" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="2" />
+    <option name="version" value="3" />
   </component>
   <component name="Vcs.Log.History.Properties">
     <option name="COLUMN_ORDER">
@@ -1241,11 +1244,11 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="760" y="94" key="#Project_Structure/0.0.2560.1040@0.0.2560.1040" timestamp="1592377765650" />
-    <state x="935" y="114" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1595786769552">
+    <state x="935" y="114" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1595831514498">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1595521315206" />
-    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1595786769552" />
+    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1595831514498" />
     <state x="1060" y="275" key="FileChooserDialogImpl" timestamp="1590912263817">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>

diff --git a/scripts/lib/domoticz.php b/scripts/lib/domoticz.php
index dcf344bc1dc4472f00bacb07f25d12079ae51ca9..8dfd12b49a2e54b4a305a536f1f45eac80a481f6 100644 (file)
--- a/scripts/lib/domoticz.php
+++ b/scripts/lib/domoticz.php
@@ -23,7 +23,7 @@ function domoticzSwitch($device, $cmd, $type = 'light', $priority = false, $dela
     if ($cmd === 'Toogle' || $cmd === 'toogle' || $cmd === 'Toggle' || $cmd === 'toggle') {
         $cmd = 'Toggle';
     }
-    if ($cmd !== 'Toggle') {
+    if(is_bool($cmd)) {
         $cmd = $cmd ? 'On' : 'Off';
     }
     return domoticzCmd(['idx' => $device, 'switchcmd' => $cmd, 'param' => 'switch' . $type, 'level' => '0', 'delay' => $delay], $priority);

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 49b135f7bee52d43dc1aa8e05d30d65e728d5d45..6cc8a3bf1cc019ef2178eb03f56ba3a8ec891fb1 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -269,10 +269,12 @@ $scenes = [
 //        ['type' => 'insteon', 'command' =>  '3?02622014690F11FF=I=3'],
 //    ],
     'chambre/rideaux/open' => [
-        ['type' => 'domoticz', 'device' => '1746', 'command' => false, 'priority' => true],
+        //['type' => 'domoticz', 'scene' => '3', 'command' => false, 'priority' => true],
+        ['type' => 'domoticz', 'device' => '1756', 'command' => 'Group Off', 'priority' => true],
     ],
     'chambre/rideaux/close' => [
-        ['type' => 'domoticz', 'device' => '1746', 'command' => true, 'priority' => true],
+        //['type' => 'domoticz', 'scene' => '3', 'command' => true, 'priority' => true],
+        ['type' => 'domoticz', 'device' => '1756', 'command' => 'Group On', 'priority' => true],
     ],
     'home/alert' => [
         ['type' => 'hue', 'group' => $alert, 'scene' => ['alert' => 'lselect']],