From: Vincent Date: Mon, 2 Nov 2020 08:12:47 +0000 (+0100) Subject: . X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=97c2c35609fdd838e9e48f7ca56c0993b836860a;p=tortuga-home.git . --- diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8971d94..37ab502 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,20 +2,16 @@ - + + + - - - - + - + - - - @@ -1291,10 +1287,10 @@ - + - + @@ -1322,9 +1318,10 @@ - - + + + diff --git a/config/bureau.php b/config/bureau.php index c2e02c2..2490a29 100644 --- a/config/bureau.php +++ b/config/bureau.php @@ -11,8 +11,8 @@ config('SLEEPSCREEN', 15); config('VIDEOPLAYER_DEVICE', 'bureau'); config('HIDEMASK_TIMEOUT', 250); // -config('TVPLAYER', 'shield'); -config('VIDEOPLAYER', 'shield'); +//config('TVPLAYER', 'shield'); +//config('VIDEOPLAYER', 'shield'); if (DISPLAYINTERFACE) { diff --git a/config/media.php b/config/media.php index ed4c691..e9381ea 100644 --- a/config/media.php +++ b/config/media.php @@ -8,7 +8,7 @@ $shortcuts['media'] = [['label' => 'TV', 'type' => 'sub', 'sub' => 'tv'], ['labe $shortcuts['media'][] = ['label' => 'Séries TV', 'type' => 'sub', 'sub' => 'seriestv']; $shortcuts['media'][] = ['label' => 'Films', 'type' => 'sub', 'sub' => 'movies']; if ($device == 'salon') { - $shortcuts['media'][] = array('type' => 'freebox', 'url' => 'scripts/freeboxchannel.php?menu=netflix', 'label' => ''); + $shortcuts['media'][] = array('type' => 'netflix', 'url' => 'scripts/netflix.php?id=home', 'label' => ''); } if ($device == 'salon' || $device == 'bureau') { $shortcuts['media'][] = ['label' => 'Nintendo Switch', 'type' => 'harmonyactivity', 'activity' => 'nintendo-switch']; diff --git a/config/remote.php b/config/remote.php index a48a27b..a2e0adb 100644 --- a/config/remote.php +++ b/config/remote.php @@ -37,6 +37,23 @@ $bricksShield = ['type' => 'shield', 'width' => 4, 'height' => 4, 'bricks' => [ ['type' => 'remote-shield-ok', 'width' => 1, 'height' => 1, 'top' => 2, 'left' => 2], ]]; +$bricksShieldMedia = ['type' => 'shieldMedia', 'width' => 5, 'height' => 4, 'bricks' => [ + ['type' => 'remote-volume', 'width' => 1, 'height' => 3, 'top' => 1, 'left' => 0], + ['type' => 'remote-rew', 'width' => 1, 'height' => 1, 'top' => 0, 'left' => 0], + ['type' => 'remote-playpause', 'width' => 2, 'height' => 1, 'top' => 0, 'left' => 1], + ['type' => 'remote-light-down', 'width' => 1, 'height' => 1, 'top' => 1, 'left' => 3], + ['type' => 'remote-fwd', 'width' => 1, 'height' => 1, 'top' => 0, 'left' => 3], + ['type' => 'remote-up', 'width' => 1, 'height' => 1, 'top' => 1, 'left' => 2], + ['type' => 'remote-left', 'width' => 1, 'height' => 1, 'top' => 2, 'left' => 1], + ['type' => 'remote-down', 'width' => 1, 'height' => 1, 'top' => 3, 'left' => 2], + ['type' => 'remote-right', 'width' => 1, 'height' => 1, 'top' => 2, 'left' => 3], + ['type' => 'remote-shield-back', 'width' => 1, 'height' => 1, 'top' => 1, 'left' => 1], + ['type' => 'remote-shield-menu', 'width' => 1, 'height' => 1, 'top' => 1 + 2, 'left' => 1], + ['type' => 'remote-shield-home', 'width' => 1, 'height' => 1, 'top' => 1 + 2, 'left' => 1 + 2], + ['type' => 'remote-shield-ok', 'width' => 1, 'height' => 1, 'top' => 2, 'left' => 2], +]]; + + $bricksSqueezebox = ['type' => 'squeezebox', 'width' => 6, 'height' => 4, 'bricks' => [ ['type' => 'remote-volume', 'width' => 1, 'height' => 3, 'top' => 0, 'left' => 0], ['type' => 'remote-rew', 'width' => 1, 'height' => 1, 'top' => 0, 'left' => 1], diff --git a/config/salon.php b/config/salon.php index 0315f2e..35af00e 100644 --- a/config/salon.php +++ b/config/salon.php @@ -2,31 +2,31 @@ config('ROOM_NAME', 'Salon'); config('ROOM', 'salon'); config('SQUEEZEBOX_PLAYER', 'Salon'); -config('VIDEOPLAYER', 'mediarasp'); -config('TVPLAYER', 'freebox'); -config('VOLUME_DEVICE', 'Harmony'); -config('VIDEOPLAYER_DEVICE','salon'); -config('HIDEMASK_TIMEOUT',250); +config('VIDEOPLAYER', 'shield'); +config('TVPLAYER', 'shield'); +config('VOLUME_DEVICE', 'shield'); +config('VIDEOPLAYER_DEVICE', 'salon'); +config('HIDEMASK_TIMEOUT', 250); if (DISPLAYINTERFACE) { - $c = salon(); - $shortcuts['lights'] = $c['all']; - $favoriteslights = [ - ['type' => 'volume', 'volume' => '3%', 'increase' => '+', 'label' => ''], - ['type' => 'volume', 'volume' => '3%', 'increase' => '-', 'label' => ''], - ]; - $favoriteslights = array_merge($favoriteslights, $c['favorites']); + $c = salon(); + $shortcuts['lights'] = $c['all']; + $favoriteslights = [ + ['type' => 'volume', 'volume' => '3%', 'increase' => '+', 'label' => ''], + ['type' => 'volume', 'volume' => '3%', 'increase' => '-', 'label' => ''], + ]; + $favoriteslights = array_merge($favoriteslights, $c['favorites']); - include_once "remote.php"; - include "default.php"; - include ROOT . "/config/media.php"; + include_once "remote.php"; + include "default.php"; + include ROOT . "/config/media.php"; - $nav = ' + $nav = ' - + diff --git a/config/tv.php b/config/tv.php index ff0ddf7..9fdb0b7 100644 --- a/config/tv.php +++ b/config/tv.php @@ -65,6 +65,9 @@ foreach ($tv as $name => $service) { if ($tvplayer === 'shield') { if (isset($service['shield'])) { $e = explode(':', $service['shield'], 2); + if ($name === 'netflix') { + $name = ''; + } $shortcuts['sub-tv'][] = array('type' => 'shield', 'url' => 'scripts/shield.php?' . $e[0] . '=' . $e[1], 'label' => $name); } } else if ($tvplayer == 'freebox') { diff --git a/js/home.js b/js/home.js index 7bfe269..3d5581b 100644 --- a/js/home.js +++ b/js/home.js @@ -821,7 +821,7 @@ function resize() { // Resize bar var nbicons = $("header a").length; - var fz = hh / nbicons / 1.4; + var fz = hh / nbicons / 1.58; $("header").css('fontSize', fz); var baseCellWidth = 6.4; diff --git a/scripts/lib/mediarasp.php b/scripts/lib/mediarasp.php index 78cd4ab..1150ef8 100644 --- a/scripts/lib/mediarasp.php +++ b/scripts/lib/mediarasp.php @@ -327,7 +327,7 @@ function mediaRaspCommons($device) if (!isAlive('bureau')) { sleep(60); } - //irsend('bureau', 'Projector', 'PowerOn'); + irsend('bureau', 'Projector', 'PowerOn'); sshRunCommand('/usr/local/bin/soundtohdmi', 'bureau', true, true); } else if ($device == 'sdb') { execScene('sdb/ampli/on'); diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php index db58dd3..d716daa 100644 --- a/scripts/lib/scenes.php +++ b/scripts/lib/scenes.php @@ -386,7 +386,7 @@ $scenes = [ ['type' => 'domoticz', 'device' => '478', 'command' => 'Toggle', 'priority' => true], ], - 'bureau/wakeuppc' => [ + 'wakeuppc' => [ ['type' => 'function', 'function' => 'wakeupPC', 'args' => ['avion']], ], 'bureau/sleeppc' => [ @@ -509,11 +509,11 @@ $scenes = [ ['type' => 'scene', 'scene' => 'bureau/sleepPC'], ], 'bureau/media/play' => [ -// ['type' => 'scene', 'scene' => 'bureau/screen/down'], -// ['type' => 'scene', 'scene' => 'bureau/rideaux/close'], -// ['type' => 'scene', 'scene' => 'bureau/off'], -// ['type' => 'function', 'function' => 'bureauAuto', 'args' => [false]], -// ['type' => 'ir', 'room' => 'bureau', 'device' => 'Projector', 'command' => 'PowerOn'], + ['type' => 'scene', 'scene' => 'bureau/screen/down'], + ['type' => 'scene', 'scene' => 'bureau/rideaux/close'], + ['type' => 'scene', 'scene' => 'bureau/off'], + ['type' => 'function', 'function' => 'bureauAuto', 'args' => [false]], + ['type' => 'ir', 'room' => 'bureau', 'device' => 'Projector', 'command' => 'PowerOn'], ], 'bureau/screen/down' => [ ['type' => 'domoticz', 'device' => '1', 'command' => true, 'priority' => true], diff --git a/scripts/lib/shield.php b/scripts/lib/shield.php index 2c65d77..49bc2c5 100644 --- a/scripts/lib/shield.php +++ b/scripts/lib/shield.php @@ -1,13 +1,18 @@