.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0055270c71b48797da906aacc6cfda297fbe958e..c976cbc515fe6a38cedfa0bbd3301033444cfe3f 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,9 @@
   <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/mediarasp.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/mediarasp.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/music.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/music.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" />
@@ -837,14 +839,13 @@
       <workItem from="1592546736447" duration="1681000" />
       <workItem from="1593068187054" duration="1636000" />
       <workItem from="1593180432819" duration="646000" />
-      <workItem from="1593196376687" duration="1472000" />
-    </task>
-    <task id="LOCAL-00281" summary=".">
-      <created>1579858821017</created>
-      <option name="number" value="00281" />
-      <option name="presentableId" value="LOCAL-00281" />
-      <option name="project" value="LOCAL" />
-      <updated>1579858821017</updated>
+      <workItem from="1593196376687" duration="1502000" />
+      <workItem from="1593344816901" duration="559000" />
+      <workItem from="1593416400573" duration="739000" />
+      <workItem from="1593501805520" duration="1107000" />
+      <workItem from="1594399361632" duration="763000" />
+      <workItem from="1594621701186" duration="596000" />
+      <workItem from="1595313798230" duration="817000" />
     </task>
     <task id="LOCAL-00282" summary=".">
       <created>1580205716585</created>
@@ -1182,7 +1183,14 @@
       <option name="project" value="LOCAL" />
       <updated>1593181059849</updated>
     </task>
-    <option name="localTasksCounter" value="330" />
+    <task id="LOCAL-00330" summary=".">
+      <created>1593344786570</created>
+      <option name="number" value="00330" />
+      <option name="presentableId" value="LOCAL-00330" />
+      <option name="project" value="LOCAL" />
+      <updated>1593344786570</updated>
+    </task>
+    <option name="localTasksCounter" value="331" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1236,11 +1244,11 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1585852940968" />
-    <state x="935" y="114" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1593181051405">
+    <state x="935" y="114" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1593344767278">
       <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="1593086272091" />
-    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1593181051405" />
+    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1593344767278" />
     <state x="1060" y="275" key="FileChooserDialogImpl" timestamp="1590912263817">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1262,10 +1270,10 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="1456" y="240" key="com.intellij.ide.util.TipDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1586418523328" />
-    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1593196601394">
+    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1593416527009">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
-    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1593196601394" />
+    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1593416527009" />
   </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />

diff --git a/config/music.php b/config/music.php
index 03c2dd5c5bca95ba8ea55d6d1168fddff7bafc2b..c389206513aec42df91eb7a11addb5170a9d3ced 100644 (file)
--- a/config/music.php
+++ b/config/music.php
@@ -79,7 +79,7 @@ function podcastDir($podcasts, $label, $key, &$shortcuts)
             } elseif (count($subitem['subitems']) == 1) {
                 $t[] = audioElement($subitem['subitems'][0], 'podcasts');
             } else {
-                $subname = $subitem['name'] ? $subitem['name'] : $subitem['title'];
+                $subname = isset($subitem['name']) && $subitem['name'] ? $subitem['name'] : $subitem['title'];
                 $subkey = $key . '-' . str_replace('.', '_', $subitem['id']);
                 $t[] = ['type' => 'sub', 'label' => $subname, 'sub' => $subkey];
                 podcastDir($subitem['subitems'], $subname, $subkey, $shortcuts);

diff --git a/scripts/domoticz_device_event.php b/scripts/domoticz_device_event.php
index 6ff92d3e4b25b4654a0e24dbb67f75a61ab81ae4..daab694e137e659ef103ced89c69f0ffff279d95 100644 (file)
--- a/scripts/domoticz_device_event.php
+++ b/scripts/domoticz_device_event.php
@@ -52,5 +52,19 @@ if ($_GET['device'] == 480) {
     }
 } else if ($_GET['device'] == 1451) {
     domoticzSwitch(1450);
+} else if ($_GET['device'] == 1695) {
+    switch ($_GET['state']) {
+        case 'Double Click':
+            execScene('wc/spa');
+            setState('wc', 1);
+            break;
+        case 'Long Click':
+            execScene('home/alert');
+            break;
+        case 'Click':
+        default:
+            wcToggle();
+            break;
+    }
 }
 echo '1';
\ No newline at end of file

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 47de559f1ac8f9f9239bf30f0bb4bb5f1f4c8c0f..e91afcd2c7dc2d6fbfe27a24a5f4e1a5a9fc458c 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -10,6 +10,7 @@ $cuisine = 8;
 $wc = 9;
 $bureau = 13;
 $sdb = 14;
+$cour = 11;
 
 $sdb_ampli = 18;
 $freebox = 19;
@@ -582,9 +583,11 @@ $scenes = [
     ],
     'cour/on' => [
         ['type' => 'domoticz', 'device' => '678', 'command' => true],
+        ['type' => 'hue', 'group' => $cour, 'scene' => '4JQxlqu9utk0geI'],
     ],
     'cour/off' => [
-        ['type' => 'domoticz', 'device' => '678', 'command' => false],
+        // ['type' => 'domoticz', 'device' => '678', 'command' => false],
+        ['type' => 'hue', 'group' => $cour, 'scene' => ['on' => false]],
     ],
     'cour/projecteurs/on' => [
         ['type' => 'domoticz', 'device' => '679', 'command' => true],