.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4a19862d8d0b7ed02c3f232ad2348d052d889552..fb11009a82d3ac2b03dab0bd602a071c43449c17 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +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$/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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -268,17 +269,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration default="true" type="ArquillianTestNG" factoryName="">
       <option name="arquillianRunConfiguration">
         <value>
@@ -959,14 +949,9 @@
       <workItem from="1611688928707" duration="1220000" />
       <workItem from="1611783609082" duration="599000" />
       <workItem from="1611911107099" duration="542000" />
-      <workItem from="1611951034456" duration="1175000" />
-    </task>
-    <task id="LOCAL-00395" summary=".">
-      <created>1605431934015</created>
-      <option name="number" value="00395" />
-      <option name="presentableId" value="LOCAL-00395" />
-      <option name="project" value="LOCAL" />
-      <updated>1605431934015</updated>
+      <workItem from="1611951034456" duration="1202000" />
+      <workItem from="1612025389189" duration="578000" />
+      <workItem from="1612099867183" duration="5529000" />
     </task>
     <task id="LOCAL-00396" summary=".">
       <created>1605432287214</created>
@@ -1304,7 +1289,14 @@
       <option name="project" value="LOCAL" />
       <updated>1611911651461</updated>
     </task>
-    <option name="localTasksCounter" value="444" />
+    <task id="LOCAL-00444" summary=".">
+      <created>1612025352669</created>
+      <option name="number" value="00444" />
+      <option name="presentableId" value="LOCAL-00444" />
+      <option name="project" value="LOCAL" />
+      <updated>1612025352669</updated>
+    </task>
+    <option name="localTasksCounter" value="445" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/global.php b/config/global.php
index 2944470323a050cd4020c09222bf9ca1a536a93c..596750a9374d97779c09b6aa12d7d113f63be954 100644 (file)
--- a/config/global.php
+++ b/config/global.php
@@ -19,7 +19,9 @@ $squeezeboxPlayers = array(
     //'Salon' => 'cc:cc:2d:15:82:0e',
     'Salon' => '5a:a1:4c:5c:e7:5e',
     'Chambre' => 'b8:27:eb:31:e1:44',
-    'WC' => '00:04:20:2a:05:2e',
+    //'WC' => '00:04:20:2a:05:2e',
+    //'WC' => 'b8:27:eb:78:f6:88',
+    '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',

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index f8fc05d647563d07587a76347719ac9b8ceab398..c56e6f44e17d198e0f775e5bf71cba21267aa78b 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -612,19 +612,19 @@ $scenes = [
     ],
     'wc/morning' => [
         ['type' => 'hue', 'group' => $wc, 'scene' => 'NC5ejamHGUNURj8'],
-        ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP', $squeezeboxPlayers['WC'], 30, 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', $squeezeboxPlayers['WC'], 35, 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', $squeezeboxPlayers['WC'], 30, 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', $squeezeboxPlayers['WC'], 30, false]],
+        ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP', $squeezeboxPlayers['WC'], 90, false]],
     ],
     'wc/night' => [
         ['type' => 'hue', 'group' => $wc, 'scene' => 'eJy09JTEzCiIL1P'],
@@ -632,7 +632,7 @@ $scenes = [
     'wc/nightambiance' => [
         ['type' => 'hue', 'group' => $wc, 'scene' => ['effect' => 'none']],
         ['type' => 'scene', 'scene' => 'wc/night'],
-        ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['Nuit d\'été', $squeezeboxPlayers['WC'], 75, false]],
+        ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['Nuit d\'été', $squeezeboxPlayers['WC'], 100, false]],
     ],
     'wc/off' => [
         ['type' => 'hue', 'group' => $wc, 'scene' => ['on' => false, 'brightness' => 0, 'effect' => 'none']],
@@ -642,7 +642,7 @@ $scenes = [
     ],
     'wc/spa' => [
         ['type' => 'hue', 'group' => $wc, 'scene' => ['effect' => 'colorloop', 'on' => true, 'brightness' => 128]],
-        ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['Rivière', $squeezeboxPlayers['WC'], 65]],
+        ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['Rivière', $squeezeboxPlayers['WC'], 100]],
     ],
     'wc/vmc/on' => [
         ['type' => 'function', 'function' => 'wcVMCOn'],
@@ -678,7 +678,7 @@ $scenes = [
     'sdb/spa' => [
         ['type' => 'state', 'key' => 'sdb', 'value' => 1],
         ['type' => 'domoticz', 'scene' => 22, 'command' => true, 'priority' => true],
-        ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['Rivière', $squeezeboxPlayers['Salle de bains'], 65]],
+        ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['Nature sounds', $squeezeboxPlayers['Salle de bains'], 65]],
     ],
     'salon/freebox/on' => [
         ['type' => 'domoticz', 'device' => '1439', 'command' => true, 'priority' => true],