.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d689ec789ba4e60ee1a3d839eeb0aeb7935d6e0f..6a526511a0e7739f35ff487b4c115a42647ef7ae 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +3,8 @@
   <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$/scripts/lib/tmdb.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/tmdb.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/remotecmd.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/remotecmd.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/tmdb.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/tmdb.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" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -741,21 +739,10 @@
       <workItem from="1571379187683" duration="3078000" />
       <workItem from="1571384814081" duration="5000" />
       <workItem from="1571569117453" duration="4627000" />
-      <workItem from="1571594532253" duration="4351000" />
-    </task>
-    <task id="LOCAL-00190" summary=".">
-      <created>1562480651361</created>
-      <option name="number" value="00190" />
-      <option name="presentableId" value="LOCAL-00190" />
-      <option name="project" value="LOCAL" />
-      <updated>1562480651361</updated>
-    </task>
-    <task id="LOCAL-00191" summary=".">
-      <created>1562482720839</created>
-      <option name="number" value="00191" />
-      <option name="presentableId" value="LOCAL-00191" />
-      <option name="project" value="LOCAL" />
-      <updated>1562482720839</updated>
+      <workItem from="1571594532253" duration="4956000" />
+      <workItem from="1571857456434" duration="773000" />
+      <workItem from="1571906412574" duration="1490000" />
+      <workItem from="1572939277711" duration="44000" />
     </task>
     <task id="LOCAL-00192" summary=".">
       <created>1562618964460</created>
@@ -1086,7 +1073,21 @@
       <option name="project" value="LOCAL" />
       <updated>1571598034347</updated>
     </task>
-    <option name="localTasksCounter" value="239" />
+    <task id="LOCAL-00239" summary=".">
+      <created>1571599059012</created>
+      <option name="number" value="00239" />
+      <option name="presentableId" value="LOCAL-00239" />
+      <option name="project" value="LOCAL" />
+      <updated>1571599059012</updated>
+    </task>
+    <task id="LOCAL-00240" summary=".">
+      <created>1571906440281</created>
+      <option name="number" value="00240" />
+      <option name="presentableId" value="LOCAL-00240" />
+      <option name="project" value="LOCAL" />
+      <updated>1571906440281</updated>
+    </task>
+    <option name="localTasksCounter" value="241" />
     <servers />
   </component>
   <component name="TodoView">

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

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 1e24fdf0d337e17fceef2e3e8905530d967c24c2..9090abebf136f0f4c1deff1805aa36ead2f84728 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -5,7 +5,6 @@ $chemineeLights = array('salon' => array(2, 3, 6), 'chambre' => array(4, 5, 20))
 $cheminee = array('salon' => 1, 'chambre' => 6);
 
 $chambre = 2;
-$chambreWOVincent = 10;
 $salon = 3;
 $cuisine = 8;
 $wc = 9;
@@ -17,14 +16,10 @@ $freebox = 19;
 
 $litvincent = 9;
 
-$bedlowscreenbrightness = 16;
+$bedlowscreenbrightness = 8;
 $home = 15;
 
-if (getState('vincenthere')) {
-    $chambrebedgroup = $chambreWOVincent;
-} else {
-    $chambrebedgroup = $chambre;
-}
+$chambrebedgroup = $chambre;
 
 $scenes = [
     'chambre/matin' => [
@@ -271,7 +266,7 @@ $scenes = [
     ],
     'home/alert' => [
         ['type' => 'phonetask', 'phone' => 'vincent', 'task' => 'Tortuga Alerte'],
-        ['type' => 'domoticz', 'device' => '392', 'switchtype' => 'device', 'command' => true, 'priority' => true],
+        ['type' => 'domoticz', 'device' => '392', 'command' => true, 'priority' => true],
         ['type' => 'hue', 'group' => $home, 'scene' => ['alert' => 'select']],
         ['type' => 'hue', 'group' => $home, 'scene' => ['alert' => 'none'], 'delay' => 1],
         ['type' => 'hue', 'group' => $home, 'scene' => ['alert' => 'select']],