.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index edbce861c14089150300d08a9812a9189c027e4d..2cdf70f3bdfaa28f2ebec39af5d1aca938698e97 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
+      <change afterPath="$PROJECT_DIR$/config/balcon.php" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/config/cour.php" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/backgrounds/balcon.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/images/backgrounds/cour.jpg" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/tools/pop/pop.py" beforeDir="false" afterPath="$PROJECT_DIR$/tools/pop/pop.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/pop/scanner.py" beforeDir="false" afterPath="$PROJECT_DIR$/tools/pop/scanner.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/pop/startpopdaemon" beforeDir="false" afterPath="$PROJECT_DIR$/tools/pop/startpopdaemon" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/rooms.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/rooms.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" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -233,7 +235,7 @@
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1553247665857" />
     <property name="dumpAutoload T:/Drive/Works/home/composer.json" value="--no-interaction --ansi --verbose --optimize" />
     <property name="editor.config.ad.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../redbr" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/config" />
     <property name="list.type.of.created.stylesheet" value="Less" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="project.structure.last.edited" value="Problems" />
@@ -242,13 +244,6 @@
     <property name="settings.editor.selected.configurable" value="editor.preferences.fonts.default" />
   </component>
   <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="T:\Drive\Works\home\tools\xplanet" />
-      <recent name="T:\Drive\Works\home\tools\pop" />
-      <recent name="T:\Drive\Works\home\scripts\lib" />
-      <recent name="D:\CloudStation\Works\home\images\backgrounds" />
-      <recent name="T:\CloudStation\Drive\Works\home\images\backgrounds" />
-    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="T:\Drive\Works\home\tools\xplanet" />
       <recent name="T:\Drive\Works\home\style\fonts\webfonts" />
@@ -256,6 +251,13 @@
       <recent name="T:\Drive\Works\home\images" />
       <recent name="D:\CloudStation\Works\home\style\fonts" />
     </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="T:\Drive\Works\home\config" />
+      <recent name="T:\Drive\Works\home\images\backgrounds" />
+      <recent name="T:\Drive\Works\home\tools\xplanet" />
+      <recent name="T:\Drive\Works\home\tools\pop" />
+      <recent name="T:\Drive\Works\home\scripts\lib" />
+    </key>
   </component>
   <component name="RunManager">
     <configuration default="true" type="Applet">
@@ -834,14 +836,8 @@
       <workItem from="1591438704520" duration="2066000" />
       <workItem from="1591456322960" duration="915000" />
       <workItem from="1591458634078" duration="3468000" />
-      <workItem from="1591856612414" duration="2361000" />
-    </task>
-    <task id="LOCAL-00276" summary=".">
-      <created>1578855521161</created>
-      <option name="number" value="00276" />
-      <option name="presentableId" value="LOCAL-00276" />
-      <option name="project" value="LOCAL" />
-      <updated>1578855521161</updated>
+      <workItem from="1591856612414" duration="3601000" />
+      <workItem from="1592205539041" duration="3681000" />
     </task>
     <task id="LOCAL-00277" summary=".">
       <created>1578900097020</created>
@@ -1179,7 +1175,14 @@
       <option name="project" value="LOCAL" />
       <updated>1591461737974</updated>
     </task>
-    <option name="localTasksCounter" value="325" />
+    <task id="LOCAL-00325" summary=".">
+      <created>1591868948121</created>
+      <option name="number" value="00325" />
+      <option name="presentableId" value="LOCAL-00325" />
+      <option name="project" value="LOCAL" />
+      <updated>1591868948121</updated>
+    </task>
+    <option name="localTasksCounter" value="326" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1229,25 +1232,27 @@
       <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="1591461729560">
-      <screen x="0" y="0" width="2560" height="1040" />
+    <state x="701" y="75" width="1170" height="972" key="CommitChangelistDialog2" timestamp="1591868920174">
+      <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="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1591461729560" />
     <state x="1060" y="275" key="FileChooserDialogImpl" timestamp="1590912263817">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="1060" y="275" key="FileChooserDialogImpl/0.0.2560.1040@0.0.2560.1040" timestamp="1590912263817" />
-    <state x="1114" y="443" key="NewPhpFileDialog" timestamp="1584290302981">
+    <state x="1114" y="443" key="NewPhpFileDialog" timestamp="1592205861310">
       <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="1584290302981" />
+    <state x="1114" y="443" key="NewPhpFileDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1592205861310" />
     <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="873" y="242" key="Vcs.Push.Dialog.v2" timestamp="1585899399605">
-      <screen x="0" y="0" width="2560" height="1040" />
+    <state x="655" y="270" key="Vcs.Push.Dialog.v2" timestamp="1591870150868">
+      <screen x="0" y="0" width="1920" height="1160" />
     </state>
+    <state x="655" y="270" key="Vcs.Push.Dialog.v2/0.0.1920.1160@0.0.1920.1160" timestamp="1591870150868" />
     <state x="873" y="242" key="Vcs.Push.Dialog.v2/0.0.2560.1040@0.0.2560.1040" timestamp="1585899399605" />
     <state x="1456" y="240" key="com.intellij.ide.util.TipDialog" timestamp="1586418523328">
       <screen x="0" y="0" width="2560" height="1040" />

diff --git a/config/balcon.php b/config/balcon.php
new file mode 100644 (file)
index 0000000..700b9e2
--- /dev/null
+++ b/config/balcon.php
@@ -0,0 +1,23 @@
+<?php
+config('ROOM_NAME', 'Balcon');
+config('ROOM', 'balcon');
+config('SQUEEZEBOX_PLAYER', 'Salon');
+config('VOLUME', 60);
+config('VOLUME_DEVICE', 'SqueezeboxPlayer');
+config('HIDEMASK_TIMEOUT',250);
+
+if (DISPLAYINTERFACE) {
+    $c = balcon();
+    $shortcuts['lights'] = $c['all'];
+    $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="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>';
+
+    $favoriteslights = [
+
+    ];
+    $favoriteslights = array_merge($favoriteslights, $c['favorites']);
+    include "default.php";
+}
\ No newline at end of file

diff --git a/config/cour.php b/config/cour.php
new file mode 100644 (file)
index 0000000..0b54ce5
--- /dev/null
+++ b/config/cour.php
@@ -0,0 +1,22 @@
+<?php
+config('ROOM_NAME', 'Cour');
+config('ROOM', 'cour');
+config('SQUEEZEBOX_PLAYER', 'Cuisine');
+config('VOLUME', 60);
+config('VOLUME_DEVICE', 'SqueezeboxPlayer');
+config('HIDEMASK_TIMEOUT',250);
+
+if (DISPLAYINTERFACE) {
+    $c = cour();
+    $shortcuts['lights'] = $c['all'];
+    $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="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>';
+    $favoriteslights = [
+
+    ];
+    $favoriteslights = array_merge($favoriteslights, $c['favorites']);
+    include "default.php";
+}
\ No newline at end of file

diff --git a/config/rooms.php b/config/rooms.php
index 7f5c6cc29e58fbc1625295d5c1f6c232ee263df9..d255b6828aa5ae935fd7c43e92b21e15006774a1 100644 (file)
--- a/config/rooms.php
+++ b/config/rooms.php
@@ -1,6 +1,6 @@
 <?php
 
-$rooms = array('home' => 'Maison', 'salon' => 'Salon', 'chambre' => 'Chambre', 'bureau' => 'Bureau', 'sdb' => 'Salle de bain');
+$rooms = array('home' => 'Maison', 'salon' => 'Salon', 'chambre' => 'Chambre', 'bureau' => 'Bureau', 'sdb' => 'Salle de bain', 'cour' => 'Cour', 'wc' => 'WC');
 
 function chambre($additionnalfavorites = array())
 {
@@ -139,6 +139,39 @@ function wc()
         ['type' => 'light', 'scene' => 'wc/off', 'label' => 'éteindre'],
         ['type' => 'light', 'scene' => 'wc/spa', 'label' => 'spa'],
         ['type' => 'light', 'scene' => 'wc/nuit', 'label' => 'nuit'],
+        ['type' => 'separator', 'label' => 'VMC'],
+        ['type' => 'light', 'scene' => 'wc/vmc/on', 'label' => 'Allumer'],
+        ['type' => 'light', 'scene' => 'wc/vmc/off', 'label' => 'éteindre'],
+    ];
+    $all = array_merge($favorites, [
+
+    ]);
+    return array('all' => $all, 'favorites' => $favorites);
+}
+
+function cour()
+{
+    $favorites = [
+        ['type' => 'light', 'scene' => 'cour/on', 'label' => 'Allumer'],
+        ['type' => 'light', 'scene' => 'cour/off', 'label' => 'éteindre'],
+        ['type' => 'separator', 'label' => 'Projecteurs'],
+        ['type' => 'light', 'scene' => 'cour/projecteurs/on', 'label' => 'Allumer'],
+        ['type' => 'light', 'scene' => 'cour/projecteurs/off', 'label' => 'éteindre'],
+    ];
+    $all = array_merge($favorites, [
+
+    ]);
+    return array('all' => $all, 'favorites' => $favorites);
+}
+
+function balcon()
+{
+    $favorites = [
+//        ['type' => 'light', 'scene' => 'cour/on', 'label' => 'Allumer'],
+//        ['type' => 'light', 'scene' => 'cour/off', 'label' => 'éteindre'],
+//        ['type' => 'separator', 'label' => 'Projecteurs'],
+//        ['type' => 'light', 'scene' => 'cour/projecteurs/on', 'label' => 'Allumer'],
+//        ['type' => 'light', 'scene' => 'cour/projecteurs/off', 'label' => 'éteindre'],
     ];
     $all = array_merge($favorites, [
 

diff --git a/images/backgrounds/balcon.jpg b/images/backgrounds/balcon.jpg
new file mode 100644 (file)
index 0000000..a5e7e73
Binary files /dev/null and b/images/backgrounds/balcon.jpg differ

diff --git a/images/backgrounds/cour.jpg b/images/backgrounds/cour.jpg
new file mode 100644 (file)
index 0000000..b7404c5
Binary files /dev/null and b/images/backgrounds/cour.jpg differ

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 2d95a241857449ae06d60f7d97eca8abd626df61..df4183ed0a73c7e768144dbb9b8fc317ae1a28e2 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -275,6 +275,7 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'chambre/bed'],
         ['type' => 'scene', 'scene' => 'bureau/off'],
         ['type' => 'scene', 'scene' => 'salon/off'],
+        ['type' => 'scene', 'scene' => 'cour/off'],
         ['type' => 'function', 'function' => 'stopHarmony'],
         ['type' => 'function', 'function' => 'stopAllSqueezebox'],
     ],
@@ -443,10 +444,12 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'home/hueoff'],
         ['type' => 'ecomode', 'mode' => '2'],
         ['type' => 'scene', 'scene' => 'salon/off'],
+        ['type' => 'scene', 'scene' => 'cour/off'],
         ['type' => 'scene', 'scene' => 'bureau/off'],
         ['type' => 'scene', 'scene' => 'chambre/off'],
         ['type' => 'scene', 'scene' => 'sdb/off'],
         ['type' => 'scene', 'scene' => 'wc/off'],
+        ['type' => 'scene', 'scene' => 'cour/off'],
         ['type' => 'function', 'function' => 'stopHarmony'],
         ['type' => 'function', 'function' => 'stopAllSqueezebox'],
         ['type' => 'function', 'function' => 'offAllOMX'],
@@ -464,6 +467,7 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'bureau/auto'],
         ['type' => 'scene', 'scene' => 'chambre/auto'],
         ['type' => 'scene', 'scene' => 'sdb/on'],
+        ['type' => 'scene', 'scene' => 'cour/on'],
         ['type' => 'scene', 'scene' => 'chambre/deshumidificateur/on'],
     ],
     'home/hueoff' => [
@@ -475,6 +479,9 @@ $scenes = [
         ['type' => 'function', 'function' => 'squeezeRequest', 'args' => ['power 1', $squeezeboxPlayers['Salon']]],
         ['type' => 'function', 'function' => 'squeezeRequest', 'args' => ['play', $squeezeboxPlayers['Salon']]]
     ],
+    'wc/on' => [
+        ['type' => 'function', 'function' => 'wcOn'],
+    ],
     'wc/morning' => [
         ['type' => 'hue', 'group' => $wc, 'scene' => 'NC5ejamHGUNURj8'],
         ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP', $squeezeboxPlayers['WC'], 30, false]],
@@ -509,6 +516,13 @@ $scenes = [
         ['type' => 'hue', 'group' => $wc, 'scene' => ['effect' => 'colorloop', 'on' => true, 'brightness' => 128]],
         ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['Rivière', $squeezeboxPlayers['WC'], 65]],
     ],
+    'wc/vmc/on' => [
+        ['type' => 'function', 'function' => 'wcVMCOn'],
+    ],
+    'wc/vmc/off' => [
+        ['type' => 'function', 'function' => 'wcVMCOff', 'args' => [0]],
+    ],
+
     'sdb/ampli/on' => [
         ['type' => 'domoticz', 'device' => '1438', 'command' => true, 'priority' => true],
     ],
@@ -541,10 +555,22 @@ $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],
     ],
     'salon/freebox/off' => [
-        ['type' => 'domoticz', 'device' => '1439', 'command' => false, 'priority' => true],
+        ['type' => 'domoticz', 'device' => '1439', 'command' => false],
+    ],
+    'cour/on' => [
+        ['type' => 'domoticz', 'device' => '678', 'command' => true],
+    ],
+    'cour/off' => [
+        ['type' => 'domoticz', 'device' => '678', 'command' => false],
+    ],
+    'cour/projecteurs/on' => [
+        ['type' => 'domoticz', 'device' => '679', 'command' => true],
+    ],
+    'cour/projecteurs/off' => [
+        ['type' => 'domoticz', 'device' => '679', 'command' => false],
     ],
     'ecomode/basic' => [
         ['type' => 'scene', 'scene' => 'sdb/ampli/off'],
@@ -896,6 +922,9 @@ function wcVMCOff($timeout = 600)
 
 function _wcVMCOff($timeout)
 {
+    if ($timeout === 0) {
+        return insteonCommand('0?1334=I=0=0');
+    }
     $rand = rand(100000, 1000000);
     setState('wcTimeout', $rand);
     sleep($timeout);