.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2cdf70f3bdfaa28f2ebec39af5d1aca938698e97..26e4c96b3ffaf6e544a4c41a3c77484ffd488efb 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change afterPath="$PROJECT_DIR$/config/balcon.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/config/cour.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/backgrounds/balcon.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/backgrounds/cour.jpg" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/rooms.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/rooms.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/cuisine.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/cuisine.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/lib/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tools/pop/pop.py" beforeDir="false" afterPath="$PROJECT_DIR$/tools/pop/pop.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tools/pop/stoppopdaemon" beforeDir="false" afterPath="$PROJECT_DIR$/tools/pop/stoppopdaemon" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -238,7 +236,7 @@
     <property name="last_opened_file_path" value="$PROJECT_DIR$/config" />
     <property name="list.type.of.created.stylesheet" value="Less" />
     <property name="nodejs_package_manager_path" value="npm" />
-    <property name="project.structure.last.edited" value="Problems" />
+    <property name="project.structure.last.edited" value="Project" />
     <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="editor.preferences.fonts.default" />
@@ -837,14 +835,9 @@
       <workItem from="1591456322960" duration="915000" />
       <workItem from="1591458634078" duration="3468000" />
       <workItem from="1591856612414" duration="3601000" />
-      <workItem from="1592205539041" duration="3681000" />
-    </task>
-    <task id="LOCAL-00277" summary=".">
-      <created>1578900097020</created>
-      <option name="number" value="00277" />
-      <option name="presentableId" value="LOCAL-00277" />
-      <option name="project" value="LOCAL" />
-      <updated>1578900097020</updated>
+      <workItem from="1592205539041" duration="8326000" />
+      <workItem from="1592379506437" duration="1336000" />
+      <workItem from="1592546736447" duration="1435000" />
     </task>
     <task id="LOCAL-00278" summary=".">
       <created>1579602721221</created>
@@ -1182,7 +1175,14 @@
       <option name="project" value="LOCAL" />
       <updated>1591868948121</updated>
     </task>
-    <option name="localTasksCounter" value="326" />
+    <task id="LOCAL-00326" summary=".">
+      <created>1592288366340</created>
+      <option name="number" value="00326" />
+      <option name="presentableId" value="LOCAL-00326" />
+      <option name="project" value="LOCAL" />
+      <updated>1592288366341</updated>
+    </task>
+    <option name="localTasksCounter" value="327" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1228,15 +1228,19 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="1511" y="161" key="#Plugins/0.0.2560.1040@0.0.2560.1040" timestamp="1586722473970" />
+    <state x="760" y="94" key="#Project_Structure" timestamp="1592377765650">
+      <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="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1585852940968">
       <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="701" y="75" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1591868920174">
-      <screen x="0" y="0" width="1920" height="1160" />
+    <state x="935" y="114" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1592288343397">
+      <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="1591868920174" />
-    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1591461729560" />
+    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1592288343397" />
     <state x="1060" y="275" key="FileChooserDialogImpl" timestamp="1590912263817">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1271,78 +1275,4 @@
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />
   </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>No facets are configured</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>home</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-                <option value="0.6" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
 </project>
\ No newline at end of file

diff --git a/config/cuisine.php b/config/cuisine.php
index b1f80d93d83e7adbb10878c5c356becb2c7dd159..d39ebe5447e85c47f78bd63af326130658079263 100644 (file)
--- a/config/cuisine.php
+++ b/config/cuisine.php
@@ -3,7 +3,7 @@ config('ROOM_NAME', 'Cuisine');
 config('ROOM', 'cuisine');
 config('SQUEEZEBOX_PLAYER', 'Cuisine');
 config('HIDEMASK_TIMEOUT', 250);
-config('VOLUME_DEVICE', 'RaspberryPi');
+config('VOLUME_DEVICE', 'SqueezeboxPlayer');
 
 if (DISPLAYINTERFACE) {
     $c = cuisine();

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index df4183ed0a73c7e768144dbb9b8fc317ae1a28e2..bd9ae2916ed846dc97d51d327583a65cdb246bb4 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -18,6 +18,7 @@ $litvincent = 9;
 
 $bedlowscreenbrightness = 12;
 $home = 15;
+$alert = 16;
 
 $chambrebedgroup = $chambre;
 
@@ -263,9 +264,7 @@ $scenes = [
         ['type' => 'insteon', 'command' => '0?1326=I=0=0'],
     ],
     'home/alert' => [
-        ['type' => 'hue', 'group' => $home, 'scene' => ['alert' => 'select']],
-        ['type' => 'hue', 'group' => $home, 'scene' => ['alert' => 'none'], 'delay' => 1],
-        ['type' => 'hue', 'group' => $home, 'scene' => ['alert' => 'select']],
+        ['type' => 'hue', 'group' => $alert, 'scene' => ['alert' => 'lselect']],
         ['type' => 'phonetask', 'phone' => 'vincent', 'task' => 'Tortuga Alerte'],
         ['type' => 'domoticz', 'device' => '392', 'command' => true],
     ],

diff --git a/tools/pop/pop.py b/tools/pop/pop.py
index fa23d7768d78062c6fa3337bcbbb49836b67b2e5..fd6151e0f6acf399cf1be798228ddbdbcad833db 100644 (file)
--- a/tools/pop/pop.py
+++ b/tools/pop/pop.py
@@ -42,14 +42,22 @@ while True:
 
         # Setup to turn notifications on, e.g.
         svc = p.getServiceByUUID("0000fe61-0000-1000-8000-00805f9b34fb")
+
         ch = svc.getCharacteristics()[0]
+        p.writeCharacteristic(ch.valHandle + 1, b'\x02\x00')
+
+        ch = svc.getCharacteristics()[1]
+        p.writeCharacteristic(ch.valHandle + 1, b'\x02\x00')
+
+        ch = svc.getCharacteristics()[2]
+        p.writeCharacteristic(ch.valHandle + 1, b'\x02\x00')
 
-        # Main loop --------
-        # p.writeCharacteristic(ch.valHandle + 1, b'\x02\x00')
+        ch = svc.getCharacteristics()[3]
+        p.writeCharacteristic(ch.valHandle + 1, b'\x02\x00')
 
         while True:
             try:
-                if p.waitForNotifications(1.0):
+                if p.waitForNotifications(60.0):
                     # handleNotification() was called
                     continue
 

diff --git a/tools/pop/stoppopdaemon b/tools/pop/stoppopdaemon
index 880a1b1b8332923b8cf1feda0bc232588f5dc434..fdccc0d908ee8dbbf4f5bb899b8c0fff718d3e52 100644 (file)
--- a/tools/pop/stoppopdaemon
+++ b/tools/pop/stoppopdaemon
@@ -1,2 +1,3 @@
 #!/bin/sh
-/sbin/start-stop-daemon --stop --pidfile /var/run/pop-$1.pid --retry 10
\ No newline at end of file
+/sbin/start-stop-daemon --stop --pidfile /var/run/pop-$1.pid
+pkill -f pop.py
\ No newline at end of file