From 2267d3e1f68c7906cee3747c93cb87be5de2504a Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 5 Nov 2019 08:35:47 +0100 Subject: [PATCH] . --- .idea/workspace.xml | 41 +++++++++++++++++++++-------------------- config/cuisine.php | 1 + scripts/lib/scenes.php | 11 +++-------- 3 files changed, 25 insertions(+), 28 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d689ec7..6a52651 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,10 +3,8 @@ - - - - + + diff --git a/config/cuisine.php b/config/cuisine.php index 3f29093..b1f80d9 100644 --- a/config/cuisine.php +++ b/config/cuisine.php @@ -3,6 +3,7 @@ config('ROOM_NAME', 'Cuisine'); config('ROOM', 'cuisine'); config('SQUEEZEBOX_PLAYER', 'Cuisine'); config('HIDEMASK_TIMEOUT', 250); +config('VOLUME_DEVICE', 'RaspberryPi'); if (DISPLAYINTERFACE) { $c = cuisine(); diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php index 1e24fdf..9090abe 100644 --- a/scripts/lib/scenes.php +++ b/scripts/lib/scenes.php @@ -5,7 +5,6 @@ $chemineeLights = array('salon' => array(2, 3, 6), 'chambre' => array(4, 5, 20)) $cheminee = array('salon' => 1, 'chambre' => 6); $chambre = 2; -$chambreWOVincent = 10; $salon = 3; $cuisine = 8; $wc = 9; @@ -17,14 +16,10 @@ $freebox = 19; $litvincent = 9; -$bedlowscreenbrightness = 16; +$bedlowscreenbrightness = 8; $home = 15; -if (getState('vincenthere')) { - $chambrebedgroup = $chambreWOVincent; -} else { - $chambrebedgroup = $chambre; -} +$chambrebedgroup = $chambre; $scenes = [ 'chambre/matin' => [ @@ -271,7 +266,7 @@ $scenes = [ ], 'home/alert' => [ ['type' => 'phonetask', 'phone' => 'vincent', 'task' => 'Tortuga Alerte'], - ['type' => 'domoticz', 'device' => '392', 'switchtype' => 'device', 'command' => true, 'priority' => true], + ['type' => 'domoticz', 'device' => '392', 'command' => true, 'priority' => true], ['type' => 'hue', 'group' => $home, 'scene' => ['alert' => 'select']], ['type' => 'hue', 'group' => $home, 'scene' => ['alert' => 'none'], 'delay' => 1], ['type' => 'hue', 'group' => $home, 'scene' => ['alert' => 'select']], -- 2.39.5