From: Vincent Vanwaelscappel Date: Mon, 20 Oct 2025 18:01:01 +0000 (+0200) Subject: . X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=3870aaa30180afa0541e85586349511a5dd4ff99;p=tortuga-home.git . --- diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml index 55d14f5..0d0c1a2 100644 --- a/.idea/dataSources.local.xml +++ b/.idea/dataSources.local.xml @@ -1,6 +1,6 @@ - + " diff --git a/.idea/workspace.xml b/.idea/workspace.xml index bd24b79..5a91d3b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,7 +7,9 @@ - + + + diff --git a/config/rooms.php b/config/rooms.php index e495a85..42bbe98 100644 --- a/config/rooms.php +++ b/config/rooms.php @@ -86,14 +86,13 @@ function salon() ]; if (!isSimpleMode()) { - $favorites = array_merge($favorites, ['type' => 'light', 'scene' => 'salon/day', 'label' => 'journée'], + $favorites = array_merge($favorites, [['type' => 'light', 'scene' => 'salon/day', 'label' => 'journée'], ['type' => 'light', 'scene' => 'salon/lumineux', 'label' => 'lumineux'], ['type' => 'light', 'scene' => 'salon/cineclub', 'label' => 'cinéma de minuit'], ['type' => 'light', 'scene' => 'salon/tamise', 'label' => 'Tamisé'], ['type' => 'light', 'scene' => 'salon/lecturenocture', 'label' => 'Lecture nocturne'], ['type' => 'light', 'scene' => 'salon/cheminee', 'label' => 'Cheminée'], - ['type' => 'light', 'scene' => 'salon/theatre', 'label' => 'Théâtre'], - ['type' => 'light', 'scene' => 'salon/bar/toggle', 'label' => 'Bar'],); + ['type' => 'light', 'scene' => 'salon/bar/toggle', 'label' => 'Bar']]); } $all = array_merge($favorites, [['type' => 'separator', 'label' => 'Projecteur'], @@ -108,6 +107,7 @@ function bureau() ['type' => 'light', 'scene' => 'bureau/auto', 'label' => 'Allumer'], ['type' => 'light', 'scene' => 'bureau/off', 'label' => 'éteindre'], ['type' => 'light', 'scene' => 'bureau/cinema', 'label' => 'Cinéma'], + ['type' => 'light', 'scene' => 'bureau/teletravail', 'label' => 'Télétravail'], ]; if (!isSimpleMode()) { diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php index 0d17f40..da71e55 100644 --- a/scripts/lib/scenes.php +++ b/scripts/lib/scenes.php @@ -424,6 +424,11 @@ $scenes = [ ], 'salon/fan/toggle' => [ ], + 'bureau/teletravail' => [ + ['type' => 'scene', 'scene' => 'bureau/auto'], + ['type' => 'scene', 'scene' => 'bureau/pc/wakeup'], + ['type' => 'ha', 'device' => HA_OFFICE_MAIN_SCREEN], + ], 'bureau/pc/wakeup' => [ ['type' => 'function', 'function' => 'wakeupPC', 'args' => ['avion']], ], diff --git a/scripts/lib/weatherstation.php b/scripts/lib/weatherstation.php index c4d9a7b..5e6aa9e 100644 --- a/scripts/lib/weatherstation.php +++ b/scripts/lib/weatherstation.php @@ -33,9 +33,9 @@ function getWeather() $res['wc_humidity'] = toNumber(haGetState('sensor.sb_wc_humidite'), true); $res['office_temp'] = toNumber(haGetState('sensor.sb_bureau_temperature'), 1); $res['office_humidity'] = toNumber(haGetState('sensor.sb_bureau_humidite'), true); - $res['cocodrilo_min'] = toNumber(haGetState('sensor.temperature_interieure_minimale', null, 'cocodrilo')); - $res['cocodrilo_max'] = toNumber(haGetState('sensor.temperature_interieure_maximale', null, 'cocodrilo')); - $res['cocodrilo_humidity'] = toNumber(haGetState('sensor.humidite_interieure', null, 'cocodrilo'),true); + $res['cocodrilo_min'] = toNumber(haGetState('sensor.temperature_interieure_minimale', null, 'cocodrilo'), true); + $res['cocodrilo_max'] = toNumber(haGetState('sensor.temperature_interieure_maximale', null, 'cocodrilo'), true); + $res['cocodrilo_humidity'] = toNumber(haGetState('sensor.humidite_interieure', null, 'cocodrilo'), true); $res['cellar_humidity'] = 0; $res['cellar_temp'] = 0; $res['pressure'] = round($weather['Pressure']['Metric']['Value']);