.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index de8e6c69433558b21fe3c199fc4dd6292da2670a..9dd08a2a6902783dc70c22285a832421ce0d3f03 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,9 +4,8 @@
     <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/rooms.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/rooms.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/gradient.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/gradient.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/vmcoff.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/vmcoff.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -849,14 +848,9 @@
       <workItem from="1595313798230" duration="4966000" />
       <workItem from="1595319860593" duration="474000" />
       <workItem from="1595398527219" duration="1869000" />
-      <workItem from="1595400793374" duration="2124000" />
-    </task>
-    <task id="LOCAL-00284" summary=".">
-      <created>1580457418659</created>
-      <option name="number" value="00284" />
-      <option name="presentableId" value="LOCAL-00284" />
-      <option name="project" value="LOCAL" />
-      <updated>1580457418659</updated>
+      <workItem from="1595400793374" duration="2325000" />
+      <workItem from="1595445984584" duration="630000" />
+      <workItem from="1595520880245" duration="180000" />
     </task>
     <task id="LOCAL-00285" summary=".">
       <created>1580458203776</created>
@@ -1194,7 +1188,14 @@
       <option name="project" value="LOCAL" />
       <updated>1595319345113</updated>
     </task>
-    <option name="localTasksCounter" value="333" />
+    <task id="LOCAL-00333" summary=".">
+      <created>1595403718905</created>
+      <option name="number" value="00333" />
+      <option name="presentableId" value="LOCAL-00333" />
+      <option name="project" value="LOCAL" />
+      <updated>1595403718906</updated>
+    </task>
+    <option name="localTasksCounter" value="334" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1236,19 +1237,15 @@
     <option name="LAST_COMMIT_MESSAGE" value="." />
   </component>
   <component name="WindowStateProjectService">
-    <state x="1511" y="161" key="#Plugins" timestamp="1586722473970">
-      <screen x="0" y="0" width="2560" height="1040" />
-    </state>
-    <state x="1511" y="161" key="#Plugins/0.0.2560.1040@0.0.2560.1040" timestamp="1586722473970" />
     <state x="760" y="94" key="#Project_Structure" timestamp="1592377765650">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="760" y="94" key="#Project_Structure/0.0.2560.1040@0.0.2560.1040" timestamp="1592377765650" />
-    <state x="935" y="114" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1595319323341">
+    <state x="935" y="114" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1595403707739">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <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="1595319323341" />
+    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1595403707739" />
     <state x="1060" y="275" key="FileChooserDialogImpl" timestamp="1590912263817">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1257,10 +1254,6 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="1114" y="443" key="NewPhpFileDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1595317059300" />
-    <state x="1420" y="165" key="SettingsEditor" timestamp="1586722506607">
-      <screen x="0" y="0" width="2560" height="1040" />
-    </state>
-    <state x="1420" y="165" key="SettingsEditor/0.0.2560.1040@0.0.2560.1040" timestamp="1586722506607" />
     <state x="655" y="270" key="Vcs.Push.Dialog.v2" timestamp="1591870150868">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>

diff --git a/config/rooms.php b/config/rooms.php
index 86aee73924600706fbe0f090346b51c30d2566b4..77337fbb5cb8b642ac2abfb36c692be8f20c2c38 100644 (file)
--- a/config/rooms.php
+++ b/config/rooms.php
@@ -84,6 +84,7 @@ function bureau()
     $all = array_merge($favorites, [
         ['type' => 'light', 'scene' => 'bureau/boreal', 'label' => 'Aurore boréale'],
         ['type' => 'light', 'scene' => 'bureau/tchernobyl', 'label' => 'Чорнобиль'],
+        ['type' => 'light', 'scene' => 'bureau/outrun', 'label' => '80\'s'],
         ['type' => 'light', 'scene' => 'bureau/tonic', 'label' => 'Tonique'],
         ['type' => 'light', 'scene' => 'bureau/flowers', 'label' => 'Printemps floral'],
         ['type' => 'light', 'scene' => 'bureau/tropical', 'label' => 'Crépuscule tropical'],
@@ -156,7 +157,7 @@ function cour()
         ['type' => 'light', 'scene' => 'cour/off', 'label' => 'éteindre'],
         ['type' => 'light', 'scene' => 'cour/lumineux', 'label' => 'lumineux'],
         ['type' => 'light', 'scene' => 'cour/daylight', 'label' => 'jour'],
-        ['type' => 'light', 'scene' => 'cour/croissance', 'label' => 'grow'],
+        ['type' => 'light', 'scene' => 'cour/grow', 'label' => 'croissance'],
         ['type' => 'light', 'scene' => 'cour/tropical', 'label' => 'crepuscule tropical'],
         ['type' => 'separator', 'label' => 'Projecteurs'],
         ['type' => 'light', 'scene' => 'cour/projecteurs/on', 'label' => 'Allumer'],

diff --git a/scripts/gradient.php b/scripts/gradient.php
index aadd7added509be79eb5dad4c2e89f204b0673fe..2d7d0e1669fd1be5d176a0ca8ac9fe05b011072b 100644 (file)
--- a/scripts/gradient.php
+++ b/scripts/gradient.php
@@ -76,6 +76,10 @@ switch ($c) {
 //        $res = ['videoid' => 'wnhvanMdx4s'];
         $res = ['videoid' => 'Xjs6fnpPWy4', 'start' => 90];
         break;
+    case '80':
+        $type = 'youtube';
+        $res = ['videoid' => 'PWMTDRWJqu4', 'start' => 30];
+        break;
     case 'off':
         $type = 'off';
         $res = 'off';

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 97ddcbbba188d8be565221006f61cd296267f703..d19c7b3bd616d9a768751df0f92fc6951ab75c58 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -377,6 +377,11 @@ $scenes = [
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'tchernobyl'],
         ['type' => 'scene', 'scene' => 'bureau/base/on'],
     ],
+    'bureau/outrun' => [
+        ['type' => 'hue', 'group' => $bureau, 'scene' => 'biXLpKpIZYDlxen'],
+        ['type' => 'state', 'key' => 'bureau_gradient', 'value' => '80'],
+        ['type' => 'scene', 'scene' => 'bureau/base/on'],
+    ],
     'bureau/boreal' => [
         ['type' => 'state', 'key' => 'bureau_gradient', 'value' => 'boreal'],
         ['type' => 'hue', 'group' => $bureau, 'scene' => 'dJaWFQBb0APEgtL'],
@@ -639,12 +644,12 @@ function execScene($name, $fromUserAction = false, $transitionTime = null)
 
     $e = explode('/', $name);
 
-    if ($fromUserAction && $e[1]!=='auto') {
+    if ($fromUserAction && $e[1] !== 'auto') {
         if ($e[0] == 'chambre') {
             chambreAuto(false);
         } else if ($e[0] == 'bureau') {
             bureauAuto(false);
-        }else if($e[0]=='cour'){
+        } else if ($e[0] == 'cour') {
             courAuto(false);
         }
     }
@@ -949,10 +954,10 @@ function updateBureauAuto()
 
 function updateCourAuto()
 {
-    if(isDay()){
-        $scene='daylight';
-    }else{
-        $scene='lumineux';
+    if (isDay()) {
+        $scene = 'daylight';
+    } else {
+        $scene = 'lumineux';
     }
     execScene('cour/' . $scene);
 }