.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 75bfb3ff46ec8f9f2ec49c34e9a4f9580f259d4b..c99dd6f21cf6edb8a1b111f0e61b602deb3ad685 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/tmdb.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/tmdb.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" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -731,14 +730,8 @@
       <workItem from="1568620913133" duration="5316000" />
       <workItem from="1568881605269" duration="592000" />
       <workItem from="1568930175160" duration="704000" />
-      <workItem from="1569007709536" duration="787000" />
-    </task>
-    <task id="LOCAL-00184" summary=".">
-      <created>1561965106323</created>
-      <option name="number" value="00184" />
-      <option name="presentableId" value="LOCAL-00184" />
-      <option name="project" value="LOCAL" />
-      <updated>1561965106324</updated>
+      <workItem from="1569007709536" duration="1390000" />
+      <workItem from="1569304828316" duration="4838000" />
     </task>
     <task id="LOCAL-00185" summary=".">
       <created>1562139892305</created>
@@ -1076,7 +1069,14 @@
       <option name="project" value="LOCAL" />
       <updated>1568881166470</updated>
     </task>
-    <option name="localTasksCounter" value="233" />
+    <task id="LOCAL-00233" summary=".">
+      <created>1569056409835</created>
+      <option name="number" value="00233" />
+      <option name="presentableId" value="LOCAL-00233" />
+      <option name="project" value="LOCAL" />
+      <updated>1569056409836</updated>
+    </task>
+    <option name="localTasksCounter" value="234" />
     <servers />
   </component>
   <component name="TodoView">

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index c1f24022775768b7782166bc2cda9c1332b6c16b..1c2d1eb194a492987f879cd944294f482c960b9a 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -66,6 +66,7 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'chambre/cheminee'],
         ['type' => 'scene', 'scene' => 'chambre/planetarium/on'], // Planétarium on
         ['type' => 'scene', 'scene' => 'chambre/deshumidificateur/off'],
+        ['type' => 'scene', 'scene' => 'chambre/raspberry/off'],
         ['type' => 'phonetask', 'phone' => 'vincent', 'task' => 'Va Au Lit'],
     ],
     'chambre/boreal' => [
@@ -124,6 +125,7 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'chambre/cheminee/smallfire'],
         ['type' => 'scene', 'scene' => 'chambre/planetarium/on'], // Planétarium on
         ['type' => 'scene', 'scene' => 'chambre/deshumidificateur/off'],
+        ['type' => 'scene', 'scene' => 'chambre/raspberry/off'],
         ['type' => 'delay', 'scene' => 'chambre/bedoff', 'delay' => 300], // Tout off dans 5 min
         ['type' => 'delay', 'scene' => 'chambre/planetarium/off', 'delay' => 3600], // Planétarium off dans une heure
         ['type' => 'scene', 'scene' => 'salon/freebox/off'],
@@ -234,14 +236,14 @@ $scenes = [
         ['type' => 'function', 'function' => 'planetarium', 'args' => [true]],
     ],
     'chambre/vincent/lecture' => [
-        ['type' => 'hue', 'light' => $litvincent, 'scene' => array('on' => true, 'brightness' => 60, 'colorTemp' => 346, 'transitionTime' => 10)],
+        ['type' => 'hue', 'light' => $litvincent, 'scene' => array('on' => true, 'brightness' => 35, 'colorTemp' => 346, 'transitionTime' => 10)],
     ],
     'chambre/vincent/litdiscret' => [
-        ['type' => 'hue', 'light' => $litvincent, 'scene' => array('on' => true, 'brightness' => 60, 'hue' => 0, 'saturation' => 255, 'transitionTime' => 1)],
+        ['type' => 'hue', 'light' => $litvincent, 'scene' => array('on' => true, 'brightness' => 20, 'hue' => 0, 'saturation' => 255, 'transitionTime' => 1)],
     ],
     'chambre/vincent/crepuscule' => [
         ['type' => 'insteon', 'command' => '3?0262261ED00F1300=I=3'],
-        ['type' => 'hue', 'light' => $litvincent, 'scene' => array('on' => true, 'brightness' => 60, 'hue' => '0', 'saturation' => 255, 'transitionTime' => 0)],
+        ['type' => 'hue', 'light' => $litvincent, 'scene' => array('on' => true, 'brightness' => 60, 'hue' => '0', 'saturation' => 255, 'transitionTime' => 10)],
         ['type' => 'hue', 'light' => $litvincent, 'scene' => array('on' => false, 'brightness' => 0, 'transitionTime' => 10 * 60)],
         ['type' => 'insteon', 'command' => '3?0262261ED00F11FF=I=3'],
     ],
@@ -678,16 +680,12 @@ function sdbToggle()
 {
     if (getState('sdb') == 1) {
         execScene('sdb/off');
+        stopSqueezebox('Salle de bains');
     } else {
         execScene('sdb/on');
     }
 }
 
-function sdbMorning()
-{
-    execScene('sdb/on');
-}
-
 function wcOn($vmc = true)
 {
     $hour = getHour();

diff --git a/tools/pop/pop.py b/tools/pop/pop.py
index 314f31e0c5c47ec908a7b215cccae89cd6d761fb..c91ebcfbe3bb64e33ddfed41002b18e0f9b7a7dd 100644 (file)
--- a/tools/pop/pop.py
+++ b/tools/pop/pop.py
@@ -7,7 +7,7 @@ import sys
 device = sys.argv[1]
 
 map = ['', '', 'tap', 'long', 'double']
-rooms = {'wc': 'wc','sdb':'sdb'}
+rooms = {'wc': 'wc', 'sdb':'sdb'}
 macs = {'wc': 'a0:e6:f8:db:ff:2f','sdb':'a0:e6:f8:dc:01:d7'}
 
 mac = macs[device]