From 1879a08d1f395f6c05bfd0a60ff7d65f5ea9a696 Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 27 Apr 2021 19:25:30 +0200 Subject: [PATCH] . --- .idea/workspace.xml | 26 ++++++++++---------------- config/global.php | 15 ++++++++------- scripts/lib/scenes.php | 8 ++++---- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 26b3fbb..083cfa2 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,14 +3,8 @@ - - - - + - - - diff --git a/config/global.php b/config/global.php index 66312e7..aa7eef4 100644 --- a/config/global.php +++ b/config/global.php @@ -10,10 +10,10 @@ define("SQUEEZEBOX_SPOTIFY_PASSWORD", '?Z8}#HK+SZrQ'); define('HUE_BRIDGE', '192.168.13.85'); define('HUE_USER', 'zZigF7nPQq9nTZ3GTB1zkntn98trOJVFHWAwFiqQ'); -define('HOMECONNECT_CLIENT_ID','97C087A66769555561D14306F34336C5D05AD97B56ED813E6BD44ECCFA980CE5'); -define('HOMECONNECT_CLIENT_SECRET','540F102E39E86F7F92C3A534C31017264A47458589E9E66D27427F35DD4F7BFC'); -define('HOMECONNECT_USERNAME','vincent@enhydra.fr'); -define('HOMECONNECT_PASSWORD','YcR%vNmYnu%e$3dx2idM'); +define('HOMECONNECT_CLIENT_ID', '97C087A66769555561D14306F34336C5D05AD97B56ED813E6BD44ECCFA980CE5'); +define('HOMECONNECT_CLIENT_SECRET', '540F102E39E86F7F92C3A534C31017264A47458589E9E66D27427F35DD4F7BFC'); +define('HOMECONNECT_USERNAME', 'vincent@enhydra.fr'); +define('HOMECONNECT_PASSWORD', 'YcR%vNmYnu%e$3dx2idM'); define('LATITUDE', 48.8758392); define('LONGITUDE', 2.3422104); @@ -28,11 +28,11 @@ $squeezeboxPlayers = array( 'Chambre' => 'b8:27:eb:31:e1:44', //'WC' => '00:04:20:2a:05:2e', //'WC' => 'b8:27:eb:78:f6:88', - 'WC' => 'a6:ce:85:78:33:a4', + // 'WC' => 'a6:ce:85:78:33:a4', 'Cuisine' => 'b8:27:eb:ec:71:34', 'Lit Jérôme' => 'b8:27:eb:62:d3:ce', 'Lit Vincent' => 'b8:27:eb:40:0e:e9', - //'Bureau' => 'b8:27:eb:f6:1d:30', + 'WC' => 'b8:27:eb:f6:1d:30', //'Bureau' => 'cc:cc:2d:2a:b5:35', 'Bureau' => '7e:23:f6:33:1d:3b', ); @@ -76,7 +76,8 @@ $devices = [ 'jarvis' => ['id' => 'jarvis', 'host' => '192.168.13.60', 'user' => 'jarvis', 'password' => 'atacama'], 'chambre' => ['id' => 'chambre', 'host' => '192.168.13.65', 'user' => 'pi', 'password' => 'atacama'], 'salon' => ['id' => 'salon', 'host' => '192.168.13.66', 'shield' => '192.168.13.40', 'user' => 'pi', 'password' => 'atacama'], - 'bureau' => ['id' => 'bureau', 'host' => '192.168.13.67', 'shield' => '192.168.13.41', 'user' => 'pi', 'password' => 'atacama'], + 'bureau' => ['id' => 'bureau', 'shield' => '192.168.13.41'], + 'wc' => ['id' => 'wc', 'host' => '192.168.13.67','user' => 'pi', 'password' => 'raspberry'], 'cuisine' => ['id' => 'cuisine', 'host' => '192.168.13.68', 'user' => 'pi', 'password' => 'atacama'], 'bureausun' => ['id' => 'bureausun', 'host' => '192.168.13.70', 'shield' => '192.168.13.41', 'user' => 'pi', 'password' => 'atacama'], 'lit' => ['id' => 'lit', 'host' => '192.168.13.69', 'user' => 'pi', 'password' => 'atacama'], diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php index 3e0f9c3..b585e5a 100644 --- a/scripts/lib/scenes.php +++ b/scripts/lib/scenes.php @@ -670,19 +670,19 @@ $scenes = [ ], 'wc/morning' => [ ['type' => 'hue', 'group' => $wc, 'scene' => 'NC5ejamHGUNURj8'], - ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP-LOFI', $squeezeboxPlayers['WC'], 90, false]], + ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP', $squeezeboxPlayers['WC'], 90, false]], ], 'wc/day' => [ ['type' => 'hue', 'group' => $wc, 'scene' => 'qfuu8z5QaJ6J26W'], - ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP-LOFI', $squeezeboxPlayers['WC'], 90, false]], + ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP', $squeezeboxPlayers['WC'], 90, false]], ], 'wc/evening' => [ ['type' => 'hue', 'group' => $wc, 'scene' => 'h82j28eNu6ZHVhM'], - ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP-LOFI', $squeezeboxPlayers['WC'], 90, false]], + ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP', $squeezeboxPlayers['WC'], 90, false]], ], 'wc/late' => [ ['type' => 'hue', 'group' => $wc, 'scene' => 'IGo4F5jRQXc1H95'], - ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP-LOFI', $squeezeboxPlayers['WC'], 90, false]], + ['type' => 'function', 'function' => 'squeezePlayByName', 'args' => ['FIP', $squeezeboxPlayers['WC'], 90, false]], ], 'wc/night' => [ ['type' => 'hue', 'group' => $wc, 'scene' => 'eJy09JTEzCiIL1P'], -- 2.39.5