.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 34f7f4c6ac065deeddcee17b816f57b7185aaa47..c81fe9857eb8e3044f312ed8540621d07c9d8cf9 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +3,9 @@
   <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/freebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/freebox.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/netgearwifiext.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/netgearwifiext.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/tortugatask.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/tortugatask.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/jarvis/commands" beforeDir="false" afterPath="$PROJECT_DIR$/tools/jarvis/commands" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/chambre.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/chambre.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/global.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/global.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/lit.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/lit.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -701,14 +700,10 @@
       <workItem from="1565857963461" duration="9853000" />
       <workItem from="1565888259142" duration="142000" />
       <workItem from="1565888705576" duration="695000" />
-      <workItem from="1565943575929" duration="354000" />
-    </task>
-    <task id="LOCAL-00154" summary=".">
-      <created>1550698148331</created>
-      <option name="number" value="00154" />
-      <option name="presentableId" value="LOCAL-00154" />
-      <option name="project" value="LOCAL" />
-      <updated>1550698148332</updated>
+      <workItem from="1565943575929" duration="1201000" />
+      <workItem from="1565950373585" duration="604000" />
+      <workItem from="1565953321589" duration="670000" />
+      <workItem from="1566068841787" duration="3255000" />
     </task>
     <task id="LOCAL-00155" summary=".">
       <created>1550734585159</created>
@@ -1046,7 +1041,14 @@
       <option name="project" value="LOCAL" />
       <updated>1565865380452</updated>
     </task>
-    <option name="localTasksCounter" value="203" />
+    <task id="LOCAL-00203" summary=".">
+      <created>1565944175034</created>
+      <option name="number" value="00203" />
+      <option name="presentableId" value="LOCAL-00203" />
+      <option name="project" value="LOCAL" />
+      <updated>1565944175034</updated>
+    </task>
+    <option name="localTasksCounter" value="204" />
     <servers />
   </component>
   <component name="TodoView">

diff --git a/config/chambre.php b/config/chambre.php
index b21887814ee5cb3237104bfaf6085081f610839b..3a9c900d4c0b92852921c19a0dfa433baf440d83 100644 (file)
--- a/config/chambre.php
+++ b/config/chambre.php
@@ -2,6 +2,11 @@
 config('ROOM_NAME','Chambre');
 config('ROOM', 'chambre');
 config('SQUEEZEBOX_PLAYER', 'Chambre');
+config('SLEEPSCREEN', 15);
+config('SCREENSAVER_BRIGHTNESS', 100);
+config('SLEEPTYPE', 'screensaver');
+config('SCREENSAVER','weatherstation');
+config('VOLUME_DEVICE', 'SqueezeboxPlayer');
 config('HIDEMASK_TIMEOUT',250);
 
 if(DISPLAYINTERFACE) {
@@ -18,6 +23,7 @@ if(DISPLAYINTERFACE) {
     $nav = '<a href="#" data-menu="home"><i class="fa fa-home" aria-hidden="true"></i></a>
     <a href="#" data-menu="lights"><i class="far fa-lightbulb" aria-hidden="true"></i></a>
     <a href="#" data-menu="music"><i class="fa fa-music" aria-hidden="true"></i></a>
+    <a href="#" data-menu="coffee"><i class="fa fa-coffee" aria-hidden="true"></i></a>
     <a href="#" data-menu="settings"><i class="fa fa-cog" aria-hidden="true"></i></a>
     <a href="#" data-action="alert"><i class="fa fa-bell" aria-hidden="true"></i></a>
     <a href="#" data-action="off"><i class="fa fa-power-off" aria-hidden="true"></i></a>';

diff --git a/config/global.php b/config/global.php
index 5579df165dc62e8a4abf34e1df76cb999faaf0a0..160a0d1bef95ec0d0566d5e630beed86d034a62b 100644 (file)
--- a/config/global.php
+++ b/config/global.php
@@ -8,17 +8,13 @@ define('HUE_USER', 'zZigF7nPQq9nTZ3GTB1zkntn98trOJVFHWAwFiqQ');
 
 $squeezeboxPlayers = array(
        'Salle de bains' => 'b8:27:eb:ab:b4:50',
-       //'Chambre' => 'b1:9b:00:28:92:32', (HTC one X)
        'Salon' => 'dc:a6:32:02:47:c1',
-       'Chambre' => '00:04:20:17:82:8b',
+       'Chambre' => 'b8:27:eb:73:33:89',
        'WC' => '00:04:20:2a:05:2e',
-       //'Cuisine' => '80:64:3a:9a:fb:dd', (One plus X)
        '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' => '00:04:20:1b:7a:d9', // Squeezebox remote
        'Bureau' => 'b8:27:eb:f6:1d:30',
-       //'Salle de bains old' => '00:23:76:da:36:2a',
 );
 
 $phones = array('vincent' => array(

diff --git a/config/lit.php b/config/lit.php
index 910f25c01c3965b975def34a8f1449c04446b0cf..b67c0076e9d3a85e5640845170491bed8b3c7954 100644 (file)
--- a/config/lit.php
+++ b/config/lit.php
@@ -1,11 +1,11 @@
 <?php
-config('ROOM_NAME','Lit');
+config('ROOM_NAME', 'Lit');
 config('ROOM', 'chambre');
 config('VIDEOPLAYER', 'mediarasp');
 config('TVPLAYER', 'mediarasp');
-config('HIDEMASK_TIMEOUT',250);
+config('HIDEMASK_TIMEOUT', 250);
 
-if(DISPLAYINTERFACE) {
+if (DISPLAYINTERFACE) {
     if (!isset($shortcuts)) {
         $shortcuts = [];
     }
@@ -18,6 +18,7 @@ if(DISPLAYINTERFACE) {
     <a href="#" data-menu="lights"><i class="far fa-lightbulb" aria-hidden="true"></i></a>
     <a href="#" data-menu="music"><i class="fa fa-music" aria-hidden="true"></i></a>
     <a href="#" data-menu="media"><i class="fa fa-tv-retro" aria-hidden="true"></i></a>
+    <a href="#" data-menu="coffee"><i class="fa fa-coffee" aria-hidden="true"></i></a>
     <a href="#" data-menu="settings"><i class="fa fa-cog" aria-hidden="true"></i></a>    
     <a href="#" data-action="alert"><i class="fa fa-bell" aria-hidden="true"></i></a>
     <a href="#" data-action="off"><i class="fa fa-power-off" aria-hidden="true"></i></a>';