.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5dad6c02d3ae23b5902f9cf685a97b25a9aa76dd..3d8f51003ec4a4bcea260958cc773df33511137c 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +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/sdb.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/sdb.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/gradient.php" beforeDir="false" afterPath="$PROJECT_DIR$/gradient.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/cachemedia.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/cachemedia.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/freeboxchannel.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/freeboxchannel.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" />
@@ -863,14 +862,11 @@
       <workItem from="1597598891734" duration="24000" />
       <workItem from="1597733676813" duration="70000" />
       <workItem from="1598117505408" duration="292000" />
-      <workItem from="1598259122444" duration="621000" />
-    </task>
-    <task id="LOCAL-00291" summary=".">
-      <created>1580934552925</created>
-      <option name="number" value="00291" />
-      <option name="presentableId" value="LOCAL-00291" />
-      <option name="project" value="LOCAL" />
-      <updated>1580934552925</updated>
+      <workItem from="1598259122444" duration="762000" />
+      <workItem from="1598297009110" duration="743000" />
+      <workItem from="1598351279992" duration="31000" />
+      <workItem from="1599118677122" duration="2877000" />
+      <workItem from="1599210105610" duration="638000" />
     </task>
     <task id="LOCAL-00292" summary=".">
       <created>1581412676917</created>
@@ -1208,7 +1204,14 @@
       <option name="project" value="LOCAL" />
       <updated>1596139717624</updated>
     </task>
-    <option name="localTasksCounter" value="340" />
+    <task id="LOCAL-00340" summary=".">
+      <created>1598265728108</created>
+      <option name="number" value="00340" />
+      <option name="presentableId" value="LOCAL-00340" />
+      <option name="project" value="LOCAL" />
+      <updated>1598265728109</updated>
+    </task>
+    <option name="localTasksCounter" value="341" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1258,11 +1261,11 @@
       <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="1596139707722">
+    <state x="935" y="70" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1599316661177">
       <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="1595521315206" />
-    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1596139707722" />
+    <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1598265694837" />
+    <state x="935" y="70" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1599316661177" />
     <state x="1060" y="275" key="FileChooserDialogImpl" timestamp="1590912263817">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1279,10 +1282,10 @@
       <screen x="0" y="0" width="1920" height="1160" />
     </state>
     <state x="655" y="270" width="816" height="530" key="Vcs.Push.Dialog.v2/0.0.1920.1160@0.0.1920.1160" timestamp="1595521362224" />
-    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1595319893185">
+    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1598297024487">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
-    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1595319893185" />
+    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1598297024487" />
   </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />

diff --git a/gradient.php b/gradient.php
index b73e3ef21e1fe7d5977e58356d24c26ca03e403c..268913c7d09d5686931fb7e907eddc659ee1e162 100644 (file)
--- a/gradient.php
+++ b/gradient.php
@@ -41,7 +41,7 @@
                             css.backgroundImage = 'none';
                             //videoURL = data.data.video_path;
                             videoURL = data.data.video_path.replace('/nas/', 'file:///Z:/');
-                            videoURL = videoURL.replace('file:///Z:/Videos/YoutubeDL', 'file:///D:/YoutubeDL');
+                            //videoURL = videoURL.replace('file:///Z:/Videos/YoutubeDL', 'file:///D:/YoutubeDL');
                             startVideo = 1;
                             if (data.data.start) {
                                 startVideo = data.data.start;

diff --git a/scripts/freeboxchannel.php b/scripts/freeboxchannel.php
index cbe1c6c64d8d6edc766a85394d93a3672c7bf5eb..1242c09235faec88635d51d32e9d1c3e4fc52bd9 100644 (file)
--- a/scripts/freeboxchannel.php
+++ b/scripts/freeboxchannel.php
@@ -7,7 +7,7 @@ if (isset($_GET['channel'])) {
 } else if (isset($_GET['menu']) && $_GET['menu'] == 'replay') {
     $commands = ['right', 'ok', 'pause=5', 'down', 'down', 'down', 'down', 'down'];
 } else if (isset($_GET['menu']) && $_GET['menu'] == 'netflix') {
-    $commands = ['right', 'down', 'down', 'ok', 'pause=25', 'ok'];
+    $commands = ['right', 'down', 'down', 'down', 'ok', 'pause=25', 'ok'];
 }
 $keys = array_merge(array('home', 'pause=2', 'home', 'pause=1', 'home', 'left', 'right', 'home'), $commands);
 

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index feaaad9b828294e7ab83bc6df376f587b0b45b0c..998cb4e593e5bc96f9d5ee532db0948e4c629e4a 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -21,14 +21,13 @@ $bedlowscreenbrightness = 12;
 $home = 15;
 $alert = 16;
 
-$chambrebedgroup = $chambre;
-$chambrefan=1761;
+$chambrefan = 1761;
 
 $scenes = [
     'chambre/matin' => [
         ['type' => 'nightmode', 'mode' => '0'],
         ['type' => 'ecomode', 'mode' => '0'],
-        ['type' => 'hue', 'group' => $chambre, 'scene' => 'JNieZpDHu5fbMyf'],
+        ['type' => 'scene', 'scene' => 'chambre/nightlights'],
         ['type' => 'hue', 'group' => $chambre, 'scene' => 'dawn', 'delay' => 1],
         ['type' => 'scene', 'scene' => 'chambre/rideaux/open', 'delay' => 31],
         ['type' => 'scene', 'scene' => 'chambre/auto', 'delay' => 35],
@@ -64,7 +63,7 @@ $scenes = [
         ['type' => 'state', 'key' => 'chambre', 'value' => 0],
         ['type' => 'scene', 'scene' => 'chambre/rideaux/close'],
         ['type' => 'insteon', 'command' => '0?1131=I=0=0'],
-        ['type' => 'hue', 'group' => $chambrebedgroup, 'scene' => 'JNieZpDHu5fbMyf'],
+        ['type' => 'scene', 'scene' => 'chambre/nightlights'],
         ['type' => 'scene', 'scene' => 'sdb/nuit'],
         ['type' => 'function', 'function' => 'bedbrightness', 'args' => [$bedlowscreenbrightness]],
         ['type' => 'scene', 'scene' => 'chambre/cheminee'],
@@ -77,6 +76,7 @@ $scenes = [
         ['type' => 'nightmode', 'mode' => '0'],
         ['type' => 'state', 'key' => 'chambre', 'value' => 1],
         ['type' => 'hue', 'group' => $chambre, 'scene' => 'mwAGvt2n70oXCqA'],
+        ['type' => 'domoticz', 'scene' => 4, 'command' => true, 'priority' => true],
         ['type' => 'insteon', 'command' => '0?1131=I=0=0'],
         ['type' => 'scene', 'scene' => 'chambre/cheminee/cold'],
     ],
@@ -84,6 +84,7 @@ $scenes = [
         ['type' => 'nightmode', 'mode' => '0'],
         ['type' => 'state', 'key' => 'chambre', 'value' => 1],
         ['type' => 'hue', 'group' => $chambre, 'scene' => 'ABqCuE-ob-sw2vQ'],
+        ['type' => 'domoticz', 'scene' => 5, 'command' => true, 'priority' => true],
         ['type' => 'insteon', 'command' => '0?1131=I=0=0'],
         ['type' => 'scene', 'scene' => 'chambre/cheminee'],
     ],
@@ -91,6 +92,7 @@ $scenes = [
         ['type' => 'nightmode', 'mode' => '0'],
         ['type' => 'state', 'key' => 'chambre', 'value' => 1],
         ['type' => 'hue', 'group' => $chambre, 'scene' => 'Ne6uJnnoPO9yRhl'],
+        ['type' => 'domoticz', 'scene' => 6, 'command' => true, 'priority' => true],
         ['type' => 'insteon', 'command' => '0?1131=I=0=0'],
         ['type' => 'function', 'function' => 'bedbrightness', 'args' => [255]],
         ['type' => 'scene', 'scene' => 'chambre/cheminee/cold'],
@@ -99,6 +101,7 @@ $scenes = [
         ['type' => 'nightmode', 'mode' => '0'],
         ['type' => 'state', 'key' => 'chambre', 'value' => 1],
         ['type' => 'hue', 'group' => $chambre, 'scene' => '03gdSwPyZ9sbZVg'],
+        ['type' => 'domoticz', 'scene' => 7, 'command' => true, 'priority' => true],
         ['type' => 'insteon', 'command' => '0?1131=I=0=0'],
         ['type' => 'function', 'function' => 'bedbrightness', 'args' => [255]],
         ['type' => 'scene', 'scene' => 'chambre/cheminee'],
@@ -107,6 +110,7 @@ $scenes = [
         ['type' => 'nightmode', 'mode' => '0'],
         ['type' => 'state', 'key' => 'chambre', 'value' => 1],
         ['type' => 'hue', 'group' => $chambre, 'scene' => 'BNiNQjxiWNbKRaH'],
+        ['type' => 'domoticz', 'scene' => 8, 'command' => true, 'priority' => true],
         ['type' => 'insteon', 'command' => '0?1131=I=0=0'],
         ['type' => 'function', 'function' => 'bedbrightness', 'args' => [255]],
         ['type' => 'scene', 'scene' => 'chambre/cheminee'],
@@ -115,6 +119,7 @@ $scenes = [
         ['type' => 'nightmode', 'mode' => '0'],
         ['type' => 'state', 'key' => 'chambre', 'value' => 1],
         ['type' => 'hue', 'group' => $chambre, 'scene' => 'Tlcft9sPK492cJA'],
+        ['type' => 'domoticz', 'scene' => 9, 'command' => true, 'priority' => true],
         ['type' => 'insteon', 'command' => '0?1131=I=0=0'],
         ['type' => 'function', 'function' => 'bedbrightness', 'args' => [255]],
         ['type' => 'scene', 'scene' => 'chambre/cheminee/cold'],
@@ -135,17 +140,20 @@ $scenes = [
         ['type' => 'delay', 'scene' => 'chambre/planetarium/off', 'delay' => 3600], // Planétarium off dans une heure
     ],
     'chambre/sleep' => [
-        ['type' => 'hue', 'group' => $chambrebedgroup, 'scene' => '-P3feFyrTnFNfXi'], // Veilleuse +
+        ['type' => 'hue', 'group' => $chambre, 'scene' => '-P3feFyrTnFNfXi'], // Veilleuse +
+        ['type' => 'domoticz', 'scene' => 10, 'command' => true, 'priority' => true],
         ['type' => 'scene', 'scene' => 'chambre/sleepbase'],
     ],
     'chambre/moon' => [
-        ['type' => 'hue', 'group' => $chambrebedgroup, 'scene' => '5PKfoOn8ss17o2l'], // Clair de lune
+        ['type' => 'hue', 'group' => $chambre, 'scene' => '5PKfoOn8ss17o2l'], // Clair de lune
+        ['type' => 'domoticz', 'scene' => 11, 'command' => true, 'priority' => true],
         ['type' => 'scene', 'scene' => 'chambre/sleepbase'],
     ],
     'chambre/party' => [
         ['type' => 'nightmode', 'mode' => '0'],
         ['type' => 'state', 'key' => 'chambre', 'value' => 1],
-        ['type' => 'hue', 'group' => $chambre, 'scene' => '4yj7eRjaNuR6S6x'],
+        ['type' => 'hue', 'group' => $chambre, 'scene' => 'qvQXHDodBPa0cZf'],
+        ['type' => 'domoticz', 'scene' => 12, 'command' => true, 'priority' => true],
         ['type' => 'insteon', 'command' => '0?1119=I=0=0'],
         ['type' => 'function', 'function' => 'bedbrightness', 'args' => [255]],
         ['type' => 'scene', 'scene' => 'chambre/cheminee'],
@@ -154,6 +162,7 @@ $scenes = [
         ['type' => 'nightmode', 'mode' => '0'],
         ['type' => 'state', 'key' => 'chambre', 'value' => 1],
         ['type' => 'hue', 'group' => $chambre, 'scene' => 'VtGPKtpQ7DF-RCd'],
+        ['type' => 'domoticz', 'scene' => 13, 'command' => true, 'priority' => true],
         ['type' => 'insteon', 'command' => '0?1131=I=0=0'],
         ['type' => 'function', 'function' => 'bedbrightness', 'args' => [255]],
         ['type' => 'scene', 'scene' => 'chambre/cheminee'],
@@ -162,6 +171,7 @@ $scenes = [
         ['type' => 'nightmode', 'mode' => '0'],
         ['type' => 'state', 'key' => 'chambre', 'value' => 1],
         ['type' => 'hue', 'group' => $chambre, 'scene' => 'Mqq8VMsmPQtzEQ0'],
+        ['type' => 'domoticz', 'scene' => 14, 'command' => true, 'priority' => true],
         ['type' => 'insteon', 'command' => '0?1131=I=0=0'],
         ['type' => 'function', 'function' => 'bedbrightness', 'args' => [255]],
         ['type' => 'scene', 'scene' => 'chambre/cheminee'],
@@ -170,13 +180,18 @@ $scenes = [
         ['type' => 'nightmode', 'mode' => '0'],
         ['type' => 'state', 'key' => 'chambre', 'value' => 1],
         ['type' => 'hue', 'group' => $chambre, 'scene' => 'HfMaPG92lEOUDB0'],
+        ['type' => 'domoticz', 'scene' => 15, 'command' => true, 'priority' => true],
         ['type' => 'insteon', 'command' => '0?1131=I=0=0'],
         ['type' => 'function', 'function' => 'bedbrightness', 'args' => [255]],
         ['type' => 'scene', 'scene' => 'chambre/cheminee'],
     ],
+    'chambre/nightlights'=>[
+        ['type' => 'hue', 'group' => $chambre, 'scene' => 'JNieZpDHu5fbMyf'],
+        ['type' => 'domoticz', 'scene' => 16, 'command' => true, 'priority' => true],
+    ],
     'chambre/summernight' => [
         ['type' => 'state', 'key' => 'chambre', 'value' => 1],
-        ['type' => 'hue', 'group' => $chambre, 'scene' => 'JNieZpDHu5fbMyf'],
+        ['type' => 'scene', 'scene' => 'chambre/nightlights'],
         ['type' => 'insteon', 'command' => '0?1131=I=0=0'],
         ['type' => 'function', 'function' => 'bedbrightness', 'args' => [255]],
         ['type' => 'scene', 'scene' => 'chambre/cheminee'],
@@ -185,6 +200,7 @@ $scenes = [
         ['type' => 'nightmode', 'mode' => '0'],
         ['type' => 'state', 'key' => 'chambre', 'value' => 1],
         ['type' => 'hue', 'group' => $chambre, 'scene' => 'XGuSVQ3RCd7JUBC'],
+        ['type' => 'domoticz', 'scene' => 17, 'command' => true, 'priority' => true],
         ['type' => 'insteon', 'command' => '0?1131=I=0=0'],
         ['type' => 'function', 'function' => 'bedbrightness', 'args' => [255]],
         ['type' => 'scene', 'scene' => 'chambre/cheminee'],
@@ -193,6 +209,7 @@ $scenes = [
         ['type' => 'nightmode', 'mode' => '0'],
         ['type' => 'state', 'key' => 'chambre', 'value' => 1],
         ['type' => 'hue', 'group' => $chambre, 'scene' => 'ZkiQbNQDXJz9-OC'],
+        ['type' => 'domoticz', 'scene' => 18, 'command' => true, 'priority' => true],
         ['type' => 'insteon', 'command' => '0?1132=I=0=0'],
         ['type' => 'function', 'function' => 'bedbrightness', 'args' => [255]],
         ['type' => 'scene', 'scene' => 'chambre/cheminee'],
@@ -207,13 +224,14 @@ $scenes = [
         ['type' => 'state', 'key' => 'chambre', 'value' => 0],
         ['type' => 'hue', 'group' => $chambre, 'scene' => array('on' => false, 'brightness' => 0)],
         ['type' => 'insteon', 'command' => '0?1332=I=0=0'],
+        ['type' => 'domoticz', 'scene' => 19, 'command' => false, 'priority' => true],
     ],
     'chambre/bedoff' => [
         ['type' => 'nightmode', 'mode' => '1'],
         ['type' => 'ecomode', 'mode' => '1'],
         ['type' => 'function', 'function' => 'chambreAuto', 'args' => [false]],
         ['type' => 'state', 'key' => 'chambre', 'value' => 0],
-        ['type' => 'hue', 'group' => $chambrebedgroup, 'scene' => array('on' => false, 'brightness' => 0)],
+        ['type' => 'hue', 'group' => $chambre, 'scene' => array('on' => false, 'brightness' => 0)],
         ['type' => 'insteon', 'command' => '0?1332=I=0=0'],
         ['type' => 'scene', 'scene' => 'chambre/deshumidificateur/off'],
         ['type' => 'function', 'function' => 'bedbrightness', 'args' => [$bedlowscreenbrightness]],
@@ -342,7 +360,7 @@ $scenes = [
         ['type' => 'domoticz', 'device' => '478', 'command' => false],
     ],
     'salon/fan/toggle' => [
-        ['type' => 'domoticz', 'device' => '478', 'command' => 'Toggle','priority'=>true],
+        ['type' => 'domoticz', 'device' => '478', 'command' => 'Toggle', 'priority' => true],
     ],
 
     'bureau/wakeuppc' => [
@@ -581,7 +599,7 @@ $scenes = [
         ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['Rivière', $squeezeboxPlayers['Salle de bains'], 65]],
     ],
     'salon/freebox/on' => [
-        ['type' => 'domoticz', 'device' => '1439', 'command' => true,'priority'=>true],
+        ['type' => 'domoticz', 'device' => '1439', 'command' => true, 'priority' => true],
     ],
     'salon/freebox/off' => [
         ['type' => 'domoticz', 'device' => '1439', 'command' => false],