.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f5d705b461068ee2c48201c68b20eca790b76182..a07ea15f940831a6daac9e14feb5916379b221ca 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +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$/config/remote.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/remote.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/remoteinfos.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/remoteinfos.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/domoticz_device_event.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/domoticz_device_event.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -887,14 +884,7 @@
       <workItem from="1603811262372" duration="1988000" />
       <workItem from="1603958541180" duration="5032000" />
       <workItem from="1604042543878" duration="11137000" />
-      <workItem from="1604152329376" duration="41433000" />
-    </task>
-    <task id="LOCAL-00315" summary=".">
-      <created>1584344076927</created>
-      <option name="number" value="00315" />
-      <option name="presentableId" value="LOCAL-00315" />
-      <option name="project" value="LOCAL" />
-      <updated>1584344076927</updated>
+      <workItem from="1604152329376" duration="42004000" />
     </task>
     <task id="LOCAL-00316" summary=".">
       <created>1584361013567</created>
@@ -1232,7 +1222,14 @@
       <option name="project" value="LOCAL" />
       <updated>1604304768803</updated>
     </task>
-    <option name="localTasksCounter" value="364" />
+    <task id="LOCAL-00364" summary=".">
+      <created>1604307121401</created>
+      <option name="number" value="00364" />
+      <option name="presentableId" value="LOCAL-00364" />
+      <option name="project" value="LOCAL" />
+      <updated>1604307121401</updated>
+    </task>
+    <option name="localTasksCounter" value="365" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1282,10 +1279,10 @@
       <screen x="0" y="0" width="1707" height="920" />
     </state>
     <state x="740" y="229" key="#com.jetbrains.php.refactoring.extractMethod.PhpExtractMethodDialog#function0/0.0.1707.920@0.0.1707.920" timestamp="1604146905948" />
-    <state x="132" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1604304758533">
+    <state x="132" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1604307094414">
       <screen x="0" y="0" width="1707" height="920" />
     </state>
-    <state x="132" y="0" width="737" height="502" key="CommitChangelistDialog2/0.0.1707.920@0.0.1707.920" timestamp="1604304758533" />
+    <state x="132" y="0" width="737" height="502" key="CommitChangelistDialog2/0.0.1707.920@0.0.1707.920" timestamp="1604307094414" />
     <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1602171117745" />
     <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1603961854066" />
     <state x="635" y="216" key="FileChooserDialogImpl" timestamp="1604227698339">

diff --git a/scripts/domoticz_device_event.php b/scripts/domoticz_device_event.php
index 8e9c0836b60d7f3cfb6b8510c21dd26fedaa0acb..025e5bbaf8951491dabf75076eb01e672f4e8374 100644 (file)
--- a/scripts/domoticz_device_event.php
+++ b/scripts/domoticz_device_event.php
@@ -30,7 +30,6 @@ if ($_GET['device'] == 480) {
             execScene('salon/on');
             break;
         case 'Free_Fall':
-            execScene('salon/off');
             off('salon');
             break;
         case 'Move':
@@ -39,14 +38,10 @@ if ($_GET['device'] == 480) {
             }
             break;
         case 'Clock_Wise':
-            if (getCurrentHarmonyActivity() !== 'poweroff') {
-                harmonyRequest('commands/volume-up?repeat=3', 'POST');
-            }
+            volume(1,'+');
             break;
         case 'Anti_Clock_Wise':
-            if (getCurrentHarmonyActivity() !== 'poweroff') {
-                harmonyRequest('commands/volume-down?repeat=5', 'POST');
-            }
+            volume(1,'-');
             break;
         case 'Tap':
             if (getCurrentHarmonyActivity() == 'poweroff') {

diff --git a/scripts/lib/harmony.php b/scripts/lib/harmony.php
index def3f3b460664d96828877403588b895c8ca6004..b2d8f00913c7825cbdba70d210130189bc213e12 100644 (file)
--- a/scripts/lib/harmony.php
+++ b/scripts/lib/harmony.php
@@ -31,7 +31,7 @@ function harmonyRequest($uri, $method = 'GET', $hub = 'salon')
 function harmonyActivity($activity)
 {
     if ($activity == 'tv' || $activity == 'poweroff' || $activity == 'off') {
-        setPlaying('freebox', 'salon');
+        setPlaying('mycanal', 'salon');
     }
     $wait = 0;
     $current = getCurrentHarmonyActivity();