.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3c1cfe01b81e88247fc4cdc7dc91906b507b5df2..6c4fe93f61b1b75900db8cb28c371206736d214a 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,6 +5,7 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/config/litjerome.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/litjerome.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/config/litvincent.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/litvincent.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/js/home.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/home.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -806,14 +807,7 @@
       <workItem from="1581934013298" duration="465000" />
       <workItem from="1581949971467" duration="946000" />
       <workItem from="1582013653504" duration="1339000" />
-      <workItem from="1582100423273" duration="393000" />
-    </task>
-    <task id="LOCAL-00254" summary=".">
-      <created>1576522982316</created>
-      <option name="number" value="00254" />
-      <option name="presentableId" value="LOCAL-00254" />
-      <option name="project" value="LOCAL" />
-      <updated>1576522982317</updated>
+      <workItem from="1582100423273" duration="1748000" />
     </task>
     <task id="LOCAL-00255" summary=".">
       <created>1577310765026</created>
@@ -1151,7 +1145,14 @@
       <option name="project" value="LOCAL" />
       <updated>1582014492440</updated>
     </task>
-    <option name="localTasksCounter" value="303" />
+    <task id="LOCAL-00303" summary=".">
+      <created>1582100835532</created>
+      <option name="number" value="00303" />
+      <option name="presentableId" value="LOCAL-00303" />
+      <option name="project" value="LOCAL" />
+      <updated>1582100835533</updated>
+    </task>
+    <option name="localTasksCounter" value="304" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1207,12 +1208,12 @@
     </state>
     <state x="720" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577298128269" />
     <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1580459136096" />
-    <state x="935" y="114" key="CommitChangelistDialog2" timestamp="1582014478567">
+    <state x="935" y="114" key="CommitChangelistDialog2" timestamp="1582100823899">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="701" y="114" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1577381105204" />
     <state x="701" y="127" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1581951527104" />
-    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1582014478567" />
+    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1582100823899" />
     <state x="92" y="92" width="2376" height="856" key="DiffContextDialog" timestamp="1580377344165">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>

diff --git a/config/litjerome.php b/config/litjerome.php
index 52fb9c99ffde1aba29f47af3b79180bdd5071f0d..123eb663a61d2fa77c3d1c584863ecad769d108b 100644 (file)
--- a/config/litjerome.php
+++ b/config/litjerome.php
@@ -1,15 +1,15 @@
 <?php
-config('ROOM_NAME','Lit Jérôme');
-config('SQUEEZEBOX_PLAYER',  'Lit Jérôme');
-config('SQUEEZEBOX_AMBIANCE_PLAYER',  'Chambre');
+config('ROOM_NAME', 'Lit Jérôme');
+config('SQUEEZEBOX_PLAYER', 'Lit Jérôme');
+config('SQUEEZEBOX_AMBIANCE_PLAYER', 'Chambre');
 config('SLEEPSCREEN', 8);
-config('SCREENSAVER_BRIGHTNESS', 100);
+config('SCREENSAVER_BRIGHTNESS', 'auto');
 config('SLEEPTYPE', 'screensaver');
-config('SCREENSAVER','weatherstation');
+config('SCREENSAVER', 'weatherstation');
 config('VOLUME_DEVICE', 'RaspberryPi');
-config('HIDEMASK_TIMEOUT',250);
+config('HIDEMASK_TIMEOUT', 250);
 
-if(DISPLAYINTERFACE) {
+if (DISPLAYINTERFACE) {
     $additionnalfavorites = [];
 
     include "lit.php";

diff --git a/config/litvincent.php b/config/litvincent.php
index dd0f8f49e6bc6371fe4190c7725b27de16cbf712..aeb6ea016b3d713244e66760e97081dfd620d352 100644 (file)
--- a/config/litvincent.php
+++ b/config/litvincent.php
@@ -3,7 +3,7 @@ config('ROOM_NAME','Lit Vincent');
 config('SQUEEZEBOX_PLAYER', 'Lit Vincent');
 config('SQUEEZEBOX_AMBIANCE_PLAYER', 'Chambre');
 config('VOLUME_DEVICE', 'RaspberryPi');
-config('SCREENSAVER_BRIGHTNESS', 100);
+config('SCREENSAVER_BRIGHTNESS', 'auto');
 config('SLEEPTYPE', 'screensaver');
 config('SCREENSAVER','weatherstation');
 config('HIDEMASK_TIMEOUT',250);

diff --git a/js/home.js b/js/home.js
index 34055c6c1a4ca54d5579e41b0be1917ade9d68b0..02b361b45c7a626bca2f6369083aedd256f0cb44 100644 (file)
--- a/js/home.js
+++ b/js/home.js
@@ -573,7 +573,7 @@ function showScreenSaver() {
 }
 
 function setScreenSaverBrightness() {
-    if (CONFIG.SCREENSAVER_BRIGHTNESS !== 255 && !videoPlaying) {
+    if (CONFIG.SCREENSAVER_BRIGHTNESS !== 255 && CONFIG.SCREENSAVER_BRIGHTNESS !== 'auto' && !videoPlaying) {
         sshCommand('sudo /usr/local/bin/screenbrightness ' + CONFIG.SCREENSAVER_BRIGHTNESS, true);
     }
 }
@@ -583,7 +583,9 @@ function hideScreenSaver() {
         return;
     }
     $(".screensaver").hide();
-    sshCommand('sudo /usr/local/bin/screenbrightness 255', true);
+    if (CONFIG.SCREENSAVER_BRIGHTNESS !== 'auto') {
+        sshCommand('sudo /usr/local/bin/screenbrightness 255', true);
+    }
 }
 
 function sshCommand(cmd, immediate, device) {