.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 26b3fbb5839e6179d6a6234dfaa2c3b6346184b3..083cfa206b4304d426d82bf89fb8bd26031e9883 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,14 +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$/config/music.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/music.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/images/rooms/medium/salon.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/medium/salon.jpg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/images/rooms/originaux/salon.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/originaux/salon.jpg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/images/rooms/small/salon.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/rooms/small/salon.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/global.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/global.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$/scripts/lib/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/squeezebox.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/style/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/style/style.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/style/style.less" beforeDir="false" afterPath="$PROJECT_DIR$/style/style.less" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1011,14 +1005,7 @@
       <workItem from="1618947923152" duration="2016000" />
       <workItem from="1619079821781" duration="1188000" />
       <workItem from="1619120393111" duration="2877000" />
-      <workItem from="1619342303709" duration="4190000" />
-    </task>
-    <task id="LOCAL-00424" summary=".">
-      <created>1608294905553</created>
-      <option name="number" value="00424" />
-      <option name="presentableId" value="LOCAL-00424" />
-      <option name="project" value="LOCAL" />
-      <updated>1608294905554</updated>
+      <workItem from="1619342303709" duration="7803000" />
     </task>
     <task id="LOCAL-00425" summary=".">
       <created>1609368280311</created>
@@ -1356,7 +1343,14 @@
       <option name="project" value="LOCAL" />
       <updated>1619248801663</updated>
     </task>
-    <option name="localTasksCounter" value="473" />
+    <task id="LOCAL-00473" summary=".">
+      <created>1619348281960</created>
+      <option name="number" value="00473" />
+      <option name="presentableId" value="LOCAL-00473" />
+      <option name="project" value="LOCAL" />
+      <updated>1619348281960</updated>
+    </task>
+    <option name="localTasksCounter" value="474" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/global.php b/config/global.php
index 66312e72fde89f879f5742625871c39f21eeace5..aa7eef416d7e8dcf815e990234f5252d7cb1f101 100644 (file)
--- a/config/global.php
+++ b/config/global.php
@@ -10,10 +10,10 @@ define("SQUEEZEBOX_SPOTIFY_PASSWORD", '?Z8}#HK+SZrQ');
 define('HUE_BRIDGE', '192.168.13.85');
 define('HUE_USER', 'zZigF7nPQq9nTZ3GTB1zkntn98trOJVFHWAwFiqQ');
 
-define('HOMECONNECT_CLIENT_ID','97C087A66769555561D14306F34336C5D05AD97B56ED813E6BD44ECCFA980CE5');
-define('HOMECONNECT_CLIENT_SECRET','540F102E39E86F7F92C3A534C31017264A47458589E9E66D27427F35DD4F7BFC');
-define('HOMECONNECT_USERNAME','vincent@enhydra.fr');
-define('HOMECONNECT_PASSWORD','YcR%vNmYnu%e$3dx2idM');
+define('HOMECONNECT_CLIENT_ID', '97C087A66769555561D14306F34336C5D05AD97B56ED813E6BD44ECCFA980CE5');
+define('HOMECONNECT_CLIENT_SECRET', '540F102E39E86F7F92C3A534C31017264A47458589E9E66D27427F35DD4F7BFC');
+define('HOMECONNECT_USERNAME', 'vincent@enhydra.fr');
+define('HOMECONNECT_PASSWORD', 'YcR%vNmYnu%e$3dx2idM');
 
 define('LATITUDE', 48.8758392);
 define('LONGITUDE', 2.3422104);
@@ -28,11 +28,11 @@ $squeezeboxPlayers = array(
     'Chambre' => 'b8:27:eb:31:e1:44',
     //'WC' => '00:04:20:2a:05:2e',
     //'WC' => 'b8:27:eb:78:f6:88',
-    'WC' => 'a6:ce:85:78:33:a4',
+    // 'WC' => 'a6:ce:85:78:33:a4',
     'Cuisine' => 'b8:27:eb:ec:71:34',
     'Lit Jérôme' => 'b8:27:eb:62:d3:ce',
     'Lit Vincent' => 'b8:27:eb:40:0e:e9',
-    //'Bureau' => 'b8:27:eb:f6:1d:30',
+    'WC' => 'b8:27:eb:f6:1d:30',
     //'Bureau' => 'cc:cc:2d:2a:b5:35',
     'Bureau' => '7e:23:f6:33:1d:3b',
 );
@@ -76,7 +76,8 @@ $devices = [
     'jarvis' => ['id' => 'jarvis', 'host' => '192.168.13.60', 'user' => 'jarvis', 'password' => 'atacama'],
     'chambre' => ['id' => 'chambre', 'host' => '192.168.13.65', 'user' => 'pi', 'password' => 'atacama'],
     'salon' => ['id' => 'salon', 'host' => '192.168.13.66', 'shield' => '192.168.13.40', 'user' => 'pi', 'password' => 'atacama'],
-    'bureau' => ['id' => 'bureau', 'host' => '192.168.13.67', 'shield' => '192.168.13.41', 'user' => 'pi', 'password' => 'atacama'],
+    'bureau' => ['id' => 'bureau', 'shield' => '192.168.13.41'],
+    'wc' => ['id' => 'wc', 'host' => '192.168.13.67','user' => 'pi', 'password' => 'raspberry'],
     'cuisine' => ['id' => 'cuisine', 'host' => '192.168.13.68', 'user' => 'pi', 'password' => 'atacama'],
     'bureausun' => ['id' => 'bureausun', 'host' => '192.168.13.70', 'shield' => '192.168.13.41', 'user' => 'pi', 'password' => 'atacama'],
     'lit' => ['id' => 'lit', 'host' => '192.168.13.69', 'user' => 'pi', 'password' => 'atacama'],

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 3e0f9c324f802a785e958c72f7cc7ca04046ac56..b585e5aec4e17b3c9c4544a52ba838a9d9f1711e 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -670,19 +670,19 @@ $scenes = [
     ],
     'wc/morning' => [
         ['type' => 'hue', 'group' => $wc, 'scene' => 'NC5ejamHGUNURj8'],
-        ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP-LOFI', $squeezeboxPlayers['WC'], 90, false]],
+        ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP', $squeezeboxPlayers['WC'], 90, false]],
     ],
     'wc/day' => [
         ['type' => 'hue', 'group' => $wc, 'scene' => 'qfuu8z5QaJ6J26W'],
-        ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP-LOFI', $squeezeboxPlayers['WC'], 90, false]],
+        ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP', $squeezeboxPlayers['WC'], 90, false]],
     ],
     'wc/evening' => [
         ['type' => 'hue', 'group' => $wc, 'scene' => 'h82j28eNu6ZHVhM'],
-        ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP-LOFI', $squeezeboxPlayers['WC'], 90, false]],
+        ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP', $squeezeboxPlayers['WC'], 90, false]],
     ],
     'wc/late' => [
         ['type' => 'hue', 'group' => $wc, 'scene' => 'IGo4F5jRQXc1H95'],
-        ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP-LOFI', $squeezeboxPlayers['WC'], 90, false]],
+        ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP', $squeezeboxPlayers['WC'], 90, false]],
     ],
     'wc/night' => [
         ['type' => 'hue', 'group' => $wc, 'scene' => 'eJy09JTEzCiIL1P'],