.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ac2fd631568ccab87dc27b90b9940cc3bbd27944..62ad3759e93cccd87d5173687474f7df255c2395 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,12 +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/chambre.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/chambre.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/lit.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/lit.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/litvincent.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/litvincent.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/salon.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/salon.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/domoticz.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/domoticz.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$/config/bureau.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/bureau.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/bureausun.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/bureausun.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -840,14 +836,8 @@
       <workItem from="1592205539041" duration="8326000" />
       <workItem from="1592379506437" duration="1336000" />
       <workItem from="1592546736447" duration="1681000" />
-      <workItem from="1593068187054" duration="1620000" />
-    </task>
-    <task id="LOCAL-00279" summary=".">
-      <created>1579628617831</created>
-      <option name="number" value="00279" />
-      <option name="presentableId" value="LOCAL-00279" />
-      <option name="project" value="LOCAL" />
-      <updated>1579628617831</updated>
+      <workItem from="1593068187054" duration="1636000" />
+      <workItem from="1593180432819" duration="583000" />
     </task>
     <task id="LOCAL-00280" summary=".">
       <created>1579775430862</created>
@@ -1185,7 +1175,14 @@
       <option name="project" value="LOCAL" />
       <updated>1592548753578</updated>
     </task>
-    <option name="localTasksCounter" value="328" />
+    <task id="LOCAL-00328" summary=".">
+      <created>1593086276650</created>
+      <option name="number" value="00328" />
+      <option name="presentableId" value="LOCAL-00328" />
+      <option name="project" value="LOCAL" />
+      <updated>1593086276651</updated>
+    </task>
+    <option name="localTasksCounter" value="329" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1239,10 +1236,10 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1585852940968" />
-    <state x="935" y="114" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1592548742823">
-      <screen x="0" y="0" width="2560" height="1040" />
+    <state x="701" y="75" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1593086272091">
+      <screen x="0" y="0" width="1920" height="1160" />
     </state>
-    <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1591868920174" />
+    <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1593086272091" />
     <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1592548742823" />
     <state x="1060" y="275" key="FileChooserDialogImpl" timestamp="1590912263817">
       <screen x="0" y="0" width="2560" height="1040" />

diff --git a/config/bureau.php b/config/bureau.php
index 601e5d072f5d516ebe24be8146918ee28b3391e1..26d7dcc17b0dcb02c894ff5ed943cb7bd7f4e7c4 100644 (file)
--- a/config/bureau.php
+++ b/config/bureau.php
@@ -3,8 +3,8 @@ config('ROOM_NAME', 'Bureau');
 config('ROOM', 'bureau');
 config('SQUEEZEBOX_PLAYER', 'Bureau');
 config('VIDEOPLAYER', 'mediarasp');
-config('VOLUME', 0);
-config('VOLUME_DEVICE', 'RaspberryPi');
+config('VOLUME', 85);
+config('VOLUME_DEVICE', 'SqueezeboxPlayer');
 config('SLEEPTYPE', 'screensaver');
 config('SCREENSAVER', 'suncurve');
 config('SLEEPSCREEN', 15);

diff --git a/config/bureausun.php b/config/bureausun.php
index 35e677b34292e4317223b8cb8a66ebf7e80622d5..250dc85926f92cd445da0277f9be4b40f616d6eb 100644 (file)
--- a/config/bureausun.php
+++ b/config/bureausun.php
@@ -1,5 +1,4 @@
 <?php
 include "bureau.php";
 config('VIDEOPLAYER_DEVICE', 'bureau');
-config('HIDEMASK_TIMEOUT', 750);
-config('VOLUME_DEVICE', 'RaspberryPi:bureau');
\ No newline at end of file
+config('HIDEMASK_TIMEOUT', 750);
\ No newline at end of file