.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 013325ea88df0e5d97250e512864528d9edb7653..f13f7f70b44f08410454fc25009adf8e48d137b3 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,6 +4,7 @@
     <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/domoticz_device_event.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/domoticz_device_event.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/lib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/lib.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -268,17 +269,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration default="true" type="ArquillianTestNG" factoryName="">
       <option name="arquillianRunConfiguration">
         <value>
@@ -953,14 +943,8 @@
       <workItem from="1611582691581" duration="2261000" />
       <workItem from="1611585304162" duration="1674000" />
       <workItem from="1611609259944" duration="949000" />
-      <workItem from="1611653492674" duration="1693000" />
-    </task>
-    <task id="LOCAL-00391" summary=".">
-      <created>1605364934828</created>
-      <option name="number" value="00391" />
-      <option name="presentableId" value="LOCAL-00391" />
-      <option name="project" value="LOCAL" />
-      <updated>1605364934828</updated>
+      <workItem from="1611653492674" duration="2030000" />
+      <workItem from="1611656202680" duration="487000" />
     </task>
     <task id="LOCAL-00392" summary=".">
       <created>1605365556377</created>
@@ -1298,7 +1282,14 @@
       <option name="project" value="LOCAL" />
       <updated>1611655053436</updated>
     </task>
-    <option name="localTasksCounter" value="440" />
+    <task id="LOCAL-00440" summary=".">
+      <created>1611655420798</created>
+      <option name="number" value="00440" />
+      <option name="presentableId" value="LOCAL-00440" />
+      <option name="project" value="LOCAL" />
+      <updated>1611655420798</updated>
+    </task>
+    <option name="localTasksCounter" value="441" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/domoticz_device_event.php b/scripts/domoticz_device_event.php
index 3470c6019ea93ebe5f86df96eaaa27cf40293043..5e4e234403183545c9320bc472bccff85d7aa03e 100644 (file)
--- a/scripts/domoticz_device_event.php
+++ b/scripts/domoticz_device_event.php
@@ -85,10 +85,10 @@ if ($_GET['device'] == 480) {
             off('bureau');
             break;
         case 'Clock_Wise':
-            volume(3, '+');
+            volume(2, '+');
             break;
         case 'Anti_Clock_Wise':
-            volume(3, '-');
+            volume(2, '-');
             break;
         case 'Tap':
             if (getCurrentHarmonyActivity() == 'poweroff') {

diff --git a/scripts/lib/lib.php b/scripts/lib/lib.php
index 37d0b7e2df4d1edbd8ea770d810aa0a15b07ad43..61c834e1368306da644fb9b89f6e3ebedd66b976 100644 (file)
--- a/scripts/lib/lib.php
+++ b/scripts/lib/lib.php
@@ -472,10 +472,13 @@ function volume($volume, $increase = '', $device = null)
                 return;
             }
             setState('last_harmony_volume', time());
+
+            $volume = min(5, max(1, $volume));
+
             if ($increase == '-') {
-                return harmonyRequest('commands/volume-down?repeat=5', 'POST');
+                return harmonyRequest('commands/volume-down?repeat=' . $volume, 'POST');
             } else {
-                return harmonyRequest('commands/volume-up?repeat=4', 'POST');
+                return harmonyRequest('commands/volume-up?repeat=' . $volume, 'POST');
             }
         case 'vlc':
             return VLCCmd(['command' => 'volume', 'val' => $increase . '20'], $device);