.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6b47c148c31ef613467e9967d2321c775ce6c29d..e57d1322b1281f251422e028c8008aebab30d83f 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +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/flowerpower.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/flowerpower.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/lib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/lib.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/servers/logcat.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/logcat.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -926,14 +925,7 @@
       <workItem from="1607945700829" duration="1640000" />
       <workItem from="1608294874717" duration="62000" />
       <workItem from="1608294975826" duration="1188000" />
-      <workItem from="1609367639356" duration="590000" />
-    </task>
-    <task id="LOCAL-00376" summary=".">
-      <created>1604828767680</created>
-      <option name="number" value="00376" />
-      <option name="presentableId" value="LOCAL-00376" />
-      <option name="project" value="LOCAL" />
-      <updated>1604828767681</updated>
+      <workItem from="1609367639356" duration="783000" />
     </task>
     <task id="LOCAL-00377" summary=".">
       <created>1605007793671</created>
@@ -1271,7 +1263,14 @@
       <option name="project" value="LOCAL" />
       <updated>1608294905554</updated>
     </task>
-    <option name="localTasksCounter" value="425" />
+    <task id="LOCAL-00425" summary=".">
+      <created>1609368280311</created>
+      <option name="number" value="00425" />
+      <option name="presentableId" value="LOCAL-00425" />
+      <option name="project" value="LOCAL" />
+      <updated>1609368280312</updated>
+    </task>
+    <option name="localTasksCounter" value="426" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/lib/lib.php b/scripts/lib/lib.php
index cb9fb41527d3aa857357610f0a9ec7489b1a3ab5..37d0b7e2df4d1edbd8ea770d810aa0a15b07ad43 100644 (file)
--- a/scripts/lib/lib.php
+++ b/scripts/lib/lib.php
@@ -434,9 +434,9 @@ function ping($ip, $timeout = 5, $port = 1817)
     return $res;
 }
 
-function volume($volume, $increase = '')
+function volume($volume, $increase = '', $device = null)
 {
-    $d = config('VOLUME_DEVICE');
+    $d = $device === null ? config('VOLUME_DEVICE') : $device;
 
     if ($increase == ' ') {
         $increase = '+';

diff --git a/servers/logcat.php b/servers/logcat.php
index f61b5dd7383e5ec5b2af7428b7b0309fe484d1f4..1fd64288a16cc4d04f9011d0698d793238068327 100644 (file)
--- a/servers/logcat.php
+++ b/servers/logcat.php
@@ -36,13 +36,13 @@ $cases = [
     'WindowManager: handleComboKeys keyCode: 25, keyAction: 1' => function () use ($device) {
         if ($device === 'salon') {
             echo 'volume-down' . "\n";
-            harmonyRequest('commands/volume-down?repeat=5', 'POST');
+            volume('3', '-', 'harmony');
         }
     },
     'WindowManager: handleComboKeys keyCode: 24, keyAction: 1' => function () use ($device) {
         if ($device === 'salon') {
             echo 'volume-up' . "\n";
-            harmonyRequest('commands/volume-up?repeat=4', 'POST');
+            volume('3', '+', 'harmony');
         }
     }
 ];