.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8d183cfdd00e4f4962ece47a43adf7bc808a626b..78582408715be8a43cb35a36b111f2a9692bb288 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,12 @@
   <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$/scripts/lib/denon.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/denon.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/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/salon.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/salon.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/lib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/lib.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" />
@@ -979,14 +984,8 @@
       <workItem from="1615881847886" duration="1242000" />
       <workItem from="1616096372227" duration="1452000" />
       <workItem from="1616413943061" duration="808000" />
-      <workItem from="1616750847432" duration="1280000" />
-    </task>
-    <task id="LOCAL-00411" summary=".">
-      <created>1606116203597</created>
-      <option name="number" value="00411" />
-      <option name="presentableId" value="LOCAL-00411" />
-      <option name="project" value="LOCAL" />
-      <updated>1606116203597</updated>
+      <workItem from="1616750847432" duration="1881000" />
+      <workItem from="1617266503786" duration="300000" />
     </task>
     <task id="LOCAL-00412" summary=".">
       <created>1606229058488</created>
@@ -1324,7 +1323,14 @@
       <option name="project" value="LOCAL" />
       <updated>1616837743512</updated>
     </task>
-    <option name="localTasksCounter" value="460" />
+    <task id="LOCAL-00460" summary=".">
+      <created>1616837886170</created>
+      <option name="number" value="00460" />
+      <option name="presentableId" value="LOCAL-00460" />
+      <option name="project" value="LOCAL" />
+      <updated>1616837886170</updated>
+    </task>
+    <option name="localTasksCounter" value="461" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/bureau.php b/config/bureau.php
index b8b4dafd12dcfebead7d96003e7a9b35a570b6a0..fee1e10def79ed82aff0347036006369763c0366 100644 (file)
--- a/config/bureau.php
+++ b/config/bureau.php
@@ -28,5 +28,5 @@ if (DISPLAYINTERFACE) {
     include "default.php";
     include ROOT . "/config/media.php";
 
-    $nav = ['home', 'lights', 'music', 'media', 'remote', 'switch', 'settings', 'alert', 'off'];
+    $nav = ['home', 'lights', 'music', 'media', 'remote', 'switch','fan', 'settings', 'alert', 'off'];
 }

diff --git a/config/chambre.php b/config/chambre.php
index 5204e6e14c6b8381f88be0f0d41faf20fd8728cc..6fa6207d2749780bec6ffcf70809e06a597615a9 100644 (file)
--- a/config/chambre.php
+++ b/config/chambre.php
@@ -20,5 +20,5 @@ if (DISPLAYINTERFACE) {
     $favoriteslights = array_merge([['type' => 'light', 'scene' => 'chambre/reading/fireplace', 'label' => 'Au coin du feu'],], $c['favorites']);
 
     include "default.php";
-    $nav = ['home', 'lights', 'music', 'remote', 'coffee', 'switch', 'settings', 'alert', 'off'];
+    $nav = ['home', 'lights', 'music', 'remote', 'coffee', 'switch', 'fan', 'settings', 'alert', 'off'];
 }
\ No newline at end of file

diff --git a/config/lit.php b/config/lit.php
index ddad250dbac3f63e4082dfa6cc64388ff45548dd..1dfc729c97d2847694a52df61ecaf5eb8ce91167 100644 (file)
--- a/config/lit.php
+++ b/config/lit.php
@@ -14,7 +14,7 @@ if (DISPLAYINTERFACE) {
     $shortcuts['lights'] = $c['all'];
     $favoriteslights = $c['favorites'];
 
-    $nav=['home','lights','music','media','coffee','switch','settings','alert','off'];
+    $nav = ['home', 'lights', 'music', 'media', 'coffee', 'switch', 'fan', 'settings', 'alert', 'off'];
 
     include "media.php";
     include "default.php";

diff --git a/config/salon.php b/config/salon.php
index a24d718218ece62ed9548a9526223ab313bdeb68..8ef1cba9e8745c3e5bcdc4fdaeb6b62e6e1328b5 100644 (file)
--- a/config/salon.php
+++ b/config/salon.php
@@ -22,5 +22,5 @@ if (DISPLAYINTERFACE) {
     include "default.php";
     include ROOT . "/config/media.php";
 
-    $nav=['home','lights','music','media','remote','switch','settings','alert','off'];
+    $nav=['home','lights','music','media','remote','switch','fan','settings','alert','off'];
 }

diff --git a/scripts/lib/lib.php b/scripts/lib/lib.php
index 55a55d0fbf8514a3075a035a6e85cebb77b246ec..a783a8e8696f27f34ce9f1eb87b71a0d19d82098 100644 (file)
--- a/scripts/lib/lib.php
+++ b/scripts/lib/lib.php
@@ -594,7 +594,7 @@ function makeNav($nav)
         'music' => '<div data-menu="music"><i class="fa fa-music" aria-hidden="true"></i><span>Musique & Radio</span></div>',
         'media' => '<div data-menu="media"><i class="fa fa-tv-retro" aria-hidden="true"></i><span>Medias & TV</span></div>',
         'coffee' => '<div data-menu="coffee"><i class="fa fa-coffee" aria-hidden="true"></i><span>Café</span></div>',
-        'fan' => '<a href="/scripts/light.php?scene=chambre/fan/toggle" class="ajax"><i class="fa fa-fan" aria-hidden="true"></i><span>Ventilateur</span></a>',
+        'fan' => '<a href="/scripts/light.php?scene='.config('ROOM').'/fan/toggle" class="ajax"><i class="fa fa-fan" aria-hidden="true"></i><span>Ventilateur</span></a>',
         'remote' => '<div data-menu="remote"><i class="fa fa-play" aria-hidden="true"></i><span>Télécommande</span></div>',
         'switch' => '<div data-menu="switch"><i class="far fa-portal-enter" aria-hidden="true"></i><span>Changer de pièce</span></div>',
         'clock' => '<div data-menu="clock"><i class="far fa-alarm-clock" aria-hidden="true"></i><span>Réveil</span></div>',

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index eeb954f1fda5f20d164c960fac11ae14273b95ca..a2c6917cf90c0eb6b1c4f07b9e71173515497a57 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -410,6 +410,16 @@ $scenes = [
     'bureau/screens/on' => [
         ['type' => 'function', 'function' => 'pcScreensProfile', 'args' => ['Tortuga', 'avion']]
     ],
+    'bureau/fan/on'=>[
+        ['type' => 'domoticz', 'device' => '3529', 'command' => true,'priority'=>true],
+    ],
+    'bureau/fan/off'=>[
+        ['type' => 'domoticz', 'device' => '3529', 'command' => true,'priority'=>true],
+    ],
+    'bureau/fan/toggle' => [
+        ['type' => 'domoticz', 'device' => '3529', 'command' => 'Toggle', 'priority' => true],
+    ],
+
     'bureau/auto' => [
         ['type' => 'function', 'function' => 'bureauAuto', 'args' => [true]],
     ],