From e1358bc06d4d8ddcb30b9afb0e2a053ae8a8a30e Mon Sep 17 00:00:00 2001 From: Vincent Date: Thu, 1 Apr 2021 10:49:23 +0200 Subject: [PATCH] . --- .idea/workspace.xml | 26 ++++++++++++++++---------- config/bureau.php | 2 +- config/chambre.php | 2 +- config/lit.php | 2 +- config/salon.php | 2 +- scripts/lib/lib.php | 2 +- scripts/lib/scenes.php | 10 ++++++++++ 7 files changed, 31 insertions(+), 15 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8d183cf..7858240 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,7 +3,12 @@ - + + + + + + diff --git a/config/bureau.php b/config/bureau.php index b8b4daf..fee1e10 100644 --- 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 5204e6e..6fa6207 100644 --- 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 ddad250..1dfc729 100644 --- 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 a24d718..8ef1cba 100644 --- 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 55a55d0..a783a8e 100644 --- a/scripts/lib/lib.php +++ b/scripts/lib/lib.php @@ -594,7 +594,7 @@ function makeNav($nav) 'music' => '
Musique & Radio
', 'media' => '
Medias & TV
', 'coffee' => '
Café
', - 'fan' => 'Ventilateur', + 'fan' => 'Ventilateur', 'remote' => '
Télécommande
', 'switch' => '
Changer de pièce
', 'clock' => '
Réveil
', diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php index eeb954f..a2c6917 100644 --- 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]], ], -- 2.39.5