From f33219a7af80abade9d5a339ebda623e7ae2ec1e Mon Sep 17 00:00:00 2001 From: Giorgio Ravera Date: Sun, 22 Dec 2024 10:01:56 +0100 Subject: [PATCH] Removed other shellies --- .storage/lovelace | 1767 +++++++++----------- automations/day.yaml | 6 +- automations/doors.yaml | 3 +- automations/energy.yaml | 5 +- components/amazon_alexa/covers.yaml | 5 +- components/amazon_alexa/lights.yaml | 6 +- components/google_assistant/covers.yaml | 11 +- components/google_assistant/lights.yaml | 6 +- components/homekit.yaml | 12 +- customizations/energy.yaml | 6 - groups/covers.yaml | 8 - groups/lights.yaml | 12 - groups/lights_bathroom.yaml | 7 - log/logbook.yaml | 2 - log/recorder.yaml | 2 - packages/shelly/shelly_customizations.yaml | 106 -- packages/shelly/shelly_groups.yaml | 6 - packages/shelly/shelly_log.yaml | 26 - shell_scripts/shelly_reboot.sh | 6 - shell_scripts/shelly_upgrade.sh | 6 - shell_scripts/shelly_uptime.sh | 6 - shell_scripts/shelly_version.sh | 6 - template_messages/speech.yaml | 4 +- utility_meter/energy.yaml | 8 - 24 files changed, 798 insertions(+), 1234 deletions(-) diff --git a/.storage/lovelace b/.storage/lovelace index 31457d9b..dbbe0953 100644 --- a/.storage/lovelace +++ b/.storage/lovelace @@ -7,158 +7,61 @@ "title": "Panoramica", "views": [ { - "theme": "Backend-selected", - "icon": "mdi:home", - "id": "main_old", - "title": "Principale Old", - "path": "main_old", "type": "sections", - "badges": [ - { - "type": "entity", - "show_name": false, - "show_state": true, - "show_icon": true, - "entity": "person.giorgio", - "color": "", - "show_entity_picture": true - }, - { - "type": "entity", - "show_name": false, - "show_state": true, - "show_icon": true, - "entity": "person.laura", - "color": "", - "show_entity_picture": true - }, - { - "type": "entity", - "show_name": false, - "show_state": true, - "show_icon": true, - "entity": "device_tracker.ff590mr_device_tracker", - "color": "", - "show_entity_picture": true - }, - { - "type": "entity", - "entity": "sensor.time" - }, - { - "type": "entity", - "show_name": false, - "show_state": false, - "show_icon": true, - "entity": "binary_sensor.porta_casa_contact", - "color": "", - "show_entity_picture": true - }, - { - "type": "entity", - "show_name": false, - "show_state": false, - "show_icon": true, - "entity": "binary_sensor.home_mode", - "color": "" - }, - { - "type": "entity", - "show_name": false, - "show_state": false, - "show_icon": true, - "entity": "binary_sensor.guard_mode", - "color": "" - }, - { - "type": "entity", - "show_name": false, - "show_state": false, - "show_icon": true, - "entity": "binary_sensor.speech_notifications", - "color": "" - }, - { - "type": "entity", - "show_name": false, - "show_state": false, - "show_icon": true, - "entity": "binary_sensor.alarms", - "color": "" - }, - { - "type": "entity", - "show_name": false, - "show_state": false, - "show_icon": true, - "entity": "binary_sensor.central_heating", - "color": "" - }, - { - "type": "entity", - "show_name": false, - "show_state": true, - "show_icon": true, - "entity": "sensor.shelly_em_old_channel_1_power", - "color": "" - }, - { - "type": "entity", - "show_name": true, - "show_state": true, - "show_icon": true, - "entity": "sensor.temperatura_balcone_temperature", - "color": "", - "name": "Balcone" - }, - { - "type": "entity", - "show_name": true, - "show_state": true, - "show_icon": true, - "entity": "sensor.temperatura_veranda_temperature", - "color": "", - "name": "Veranda" - } - ], - "cards": [], + "max_columns": 3, + "title": "Principale", + "path": "main", + "icon": "mdi:home", "sections": [ { "type": "grid", "cards": [ + { + "type": "heading", + "heading_style": "subtitle" + }, { "type": "picture-glance", "aspect_ratio": "0%", "entities": [ { - "entity": "light.luce_corridoio" + "entity": "light.luce_zona_giorno" + }, + { + "entity": "light.luce_armadio" } ], - "entity": "light.luce_corridoio", + "entity": "light.luce_zona_giorno", "state_image": { "off": "/local/images/rooms/corridoio_off.jpg", "on": "/local/images/rooms/corridoio_on.jpg" }, - "title": "Corridoio" + "title": "Zona Giorno" }, { "type": "picture-glance", "aspect_ratio": "0%", "entities": [ { - "entity": "light.luce_cucina_old" + "entity": "light.luce_cucina" }, { - "entity": "cover.tapparella_cucina_old" + "entity": "light.luce_vetrine" }, { - "entity": "climate.bagno_grande" + "entity": "cover.tapparella_cucina_grande" + }, + { + "entity": "cover.tapparella_cucina_piccola" + }, + { + "entity": "climate.cucina" }, { "entity": "media_player.google_home" } ], - "entity": "light.luce_cucina_old", + "entity": "group.lights_kitchen", "state_image": { "off": "/local/images/rooms/cucina_off.jpg", "on": "/local/images/rooms/cucina_on.jpg" @@ -166,22 +69,30 @@ "title": "Cucina" }, { - "camera_view": "auto", "type": "picture-glance", "aspect_ratio": "0%", "entities": [ + { + "entity": "light.luce_sala" + }, { "entity": "light.luce_divano" }, { - "entity": "cover.tapparella_sala_old" + "entity": "cover.tapparella_sala" + }, + { + "entity": "climate.sala" }, { "entity": "media_player.sony_kd_55xf8596" } ], - "entity": "group.lights_livingroom_old", - "image": "/local/images/rooms/sala_off.jpg", + "entity": "group.lights_livingroom", + "state_image": { + "off": "/local/images/rooms/sala_off.jpg", + "on": "/local/images/rooms/sala_on.jpg" + }, "title": "Sala" }, { @@ -189,18 +100,102 @@ "aspect_ratio": "0%", "entities": [ { - "entity": "light.luce_bagno_old" + "entity": "light.luce_studio" + }, + { + "entity": "cover.tapparella_studio" + }, + { + "entity": "climate.studio" + } + ], + "entity": "light.luce_studio", + "state_image": { + "off": "/local/images/rooms/studio_off.jpg", + "on": "/local/images/rooms/studio_on.jpg" + }, + "title": "Studio" + }, + { + "type": "picture-glance", + "aspect_ratio": "0%", + "entities": [ + { + "entity": "light.luce_zona_notte" + } + ], + "entity": "light.luce_zona_notte", + "state_image": { + "off": "/local/images/rooms/corridoio_off.jpg", + "on": "/local/images/rooms/corridoio_on.jpg" + }, + "title": "Zona Notte" + }, + { + "type": "picture-glance", + "aspect_ratio": "0%", + "entities": [ + { + "entity": "light.luce_bagno" + }, + { + "entity": "light.luce_specchio" + }, + { + "entity": "light.luce_trono" + }, + { + "entity": "cover.tapparella_bagno" }, { - "entity": "light.luce_specchio_old" + "entity": "climate.bagno_grande" } ], - "entity": "group.lights_bathroom_old", + "entity": "group.lights_bathroom", "state_image": { "off": "/local/images/rooms/bagno_off.jpg", "on": "/local/images/rooms/bagno_on.jpg" }, - "title": "Bagno" + "title": "Bagno Grande" + }, + { + "type": "picture-glance", + "aspect_ratio": "0%", + "entities": [ + { + "entity": "light.luce_camera" + }, + { + "entity": "cover.tapparella_camera" + }, + { + "entity": "climate.camera" + }, + { + "entity": "media_player.tv_camera" + } + ], + "entity": "light.luce_camera", + "state_image": { + "off": "/local/images/rooms/camera_off.jpg", + "on": "/local/images/rooms/camera_on.jpg" + }, + "title": "Camera" + }, + { + "type": "picture-glance", + "aspect_ratio": "0%", + "entities": [ + { + "entity": "light.luce_balcone" + } + ], + "entity": "light.luce_balcone", + "state_image": { + "off": "/local/images/rooms/balcone_off.jpg", + "on": "/local/images/rooms/balcone_on.jpg" + }, + "title": "Balcone" }, { "type": "custom:clock-weather-card", @@ -226,7 +221,7 @@ { "type": "custom:mini-graph-card", "entities": [ - "sensor.shelly_em_old_channel_1_power" + "sensor.shelly_em_channel_1_power" ], "hours_to_show": 24, "points_per_hour": 120, @@ -430,22 +425,128 @@ "column_span": 3 } ], - "max_columns": 3 - }, - { - "theme": "Backend-selected", - "icon": "mdi:lightbulb", - "id": "lights", - "title": "Luci Old", - "path": "lights_old", + "dense_section_placement": false, + "cards": [], "badges": [ { "type": "entity", - "entity": "light.luce_corridoio", - "show_name": true, + "show_name": false, + "show_state": true, + "show_icon": true, + "entity": "person.giorgio", + "color": "", + "show_entity_picture": true + }, + { + "type": "entity", + "show_name": false, + "show_state": true, + "show_icon": true, + "entity": "person.laura", + "color": "", + "show_entity_picture": true + }, + { + "type": "entity", + "show_name": false, + "show_state": true, + "show_icon": true, + "entity": "device_tracker.ff590mr_device_tracker", + "color": "", + "show_entity_picture": true + }, + { + "type": "entity", + "entity": "sensor.time" + }, + { + "type": "entity", + "show_name": false, + "show_state": false, + "show_icon": true, + "entity": "binary_sensor.porta_casa_contact", + "color": "", + "show_entity_picture": true + }, + { + "type": "entity", + "show_name": false, + "show_state": false, + "show_icon": true, + "entity": "binary_sensor.home_mode", + "color": "" + }, + { + "type": "entity", + "show_name": false, + "show_state": false, + "show_icon": true, + "entity": "binary_sensor.guard_mode", + "color": "" + }, + { + "type": "entity", + "show_name": false, + "show_state": false, + "show_icon": true, + "entity": "binary_sensor.speech_notifications", + "color": "" + }, + { + "type": "entity", + "show_name": false, + "show_state": false, + "show_icon": true, + "entity": "binary_sensor.alarms", + "color": "" + }, + { + "type": "entity", + "show_name": false, + "show_state": false, + "show_icon": true, + "entity": "binary_sensor.central_heating", + "color": "" + }, + { + "type": "entity", + "entity": "sensor.shelly_em_channel_1_power" + }, + { + "type": "entity", + "show_name": true, + "show_state": true, + "show_icon": true, + "entity": "sensor.temperatura_balcone_temperature", + "color": "", + "name": "Balcone" + }, + { + "type": "entity", + "show_name": true, "show_state": true, "show_icon": true, + "entity": "sensor.temperatura_veranda_temperature", + "color": "", + "name": "Veranda" + } + ] + }, + { + "theme": "Backend-selected", + "icon": "mdi:lightbulb", + "id": "lights", + "title": "Luci", + "path": "lights", + "badges": [ + { + "type": "entity", + "show_name": true, + "show_state": false, + "show_icon": true, + "entity": "light.luce_zona_giorno", "color": "", + "name": "Zona Giorno", "tap_action": { "action": "toggle" } @@ -453,10 +554,11 @@ { "type": "entity", "show_name": true, - "show_state": true, + "show_state": false, "show_icon": true, - "entity": "light.luce_cucina_old", + "entity": "light.luce_armadio", "color": "", + "name": "Armadio", "tap_action": { "action": "toggle" } @@ -464,10 +566,47 @@ { "type": "entity", "show_name": true, - "show_state": true, + "show_state": false, + "show_icon": true, + "entity": "light.luce_cucina", + "color": "", + "name": "Cucina", + "tap_action": { + "action": "toggle" + } + }, + { + "type": "entity", + "show_name": true, + "show_state": false, + "show_icon": true, + "entity": "light.luce_vetrine", + "color": "", + "name": "Vetrine", + "tap_action": { + "action": "toggle" + } + }, + { + "type": "entity", + "show_name": true, + "show_state": false, + "show_icon": true, + "entity": "light.luce_sala", + "color": "", + "name": "Sala", + "tap_action": { + "action": "toggle" + } + }, + { + "type": "entity", + "show_name": true, + "show_state": false, "show_icon": true, "entity": "light.luce_divano", "color": "", + "name": "Divano", "tap_action": { "action": "toggle" } @@ -475,10 +614,23 @@ { "type": "entity", "show_name": true, - "show_state": true, + "show_state": false, + "show_icon": true, + "entity": "light.luce_studio", + "color": "", + "name": "Studio", + "tap_action": { + "action": "toggle" + } + }, + { + "type": "entity", + "show_name": true, + "show_state": false, "show_icon": true, - "entity": "light.luce_bagno_old", + "entity": "light.luce_zona_notte", "color": "", + "name": "Zona Notte", "tap_action": { "action": "toggle" } @@ -486,10 +638,11 @@ { "type": "entity", "show_name": true, - "show_state": true, + "show_state": false, "show_icon": true, - "entity": "light.luce_specchio_old", + "entity": "light.luce_bagno", "color": "", + "name": "Bagno", "tap_action": { "action": "toggle" } @@ -497,10 +650,11 @@ { "type": "entity", "show_name": true, - "show_state": true, + "show_state": false, "show_icon": true, - "entity": "light.luce_dispensa", + "entity": "light.luce_specchio", "color": "", + "name": "Specchio", "tap_action": { "action": "toggle" } @@ -508,10 +662,35 @@ { "type": "entity", "show_name": true, - "show_state": true, + "show_state": false, "show_icon": true, - "entity": "light.luce_veranda", + "entity": "light.luce_trono", + "color": "", + "name": "Trono", + "tap_action": { + "action": "toggle" + } + }, + { + "type": "entity", + "show_name": true, + "show_state": false, + "show_icon": true, + "entity": "light.luce_camera", + "color": "", + "name": "Camera", + "tap_action": { + "action": "toggle" + } + }, + { + "type": "entity", + "show_name": true, + "show_state": false, + "show_icon": true, + "entity": "light.luce_balcone", "color": "", + "name": "Balcone", "tap_action": { "action": "toggle" } @@ -521,21 +700,50 @@ { "entities": [ { - "entity": "group.lights_old" + "entity": "group.lights" + }, + { + "entity": "light.luce_zona_giorno" + }, + { + "entity": "light.luce_armadio" + }, + { + "type": "custom:fold-entity-row", + "head": "group.lights_kitchen", + "entities": [ + "light.luce_cucina", + "light.luce_vetrine" + ] + }, + { + "type": "custom:fold-entity-row", + "head": "group.lights_livingroom", + "entities": [ + "light.luce_sala", + "light.luce_divano" + ] }, { - "entity": "light.luce_corridoio" + "entity": "light.luce_studio" }, { - "entity": "light.luce_cucina_old" + "entity": "light.luce_zona_notte" }, { "type": "custom:fold-entity-row", - "head": "group.lights_bathroom_old", + "head": "group.lights_bathroom", "entities": [ - "light.luce_bagno_old", - "light.luce_specchio_old" + "light.luce_bagno", + "light.luce_specchio", + "light.luce_trono" ] + }, + { + "entity": "light.luce_camera" + }, + { + "entity": "light.luce_balcone" } ], "show_header_toggle": false, @@ -543,22 +751,47 @@ "type": "entities" }, { - "entity": "group.lights_old", + "entity": "group.lights", "name": "Luci Casa", "type": "tile" }, { - "entity": "light.luce_corridoio", - "name": "Luce Corridoio", + "entity": "light.luce_zona_giorno", + "name": "Luce Zona Giorno", + "type": "tile" + }, + { + "entity": "light.luce_armadio", + "name": "Luce Armadio", "type": "tile" }, { - "entity": "light.luce_cucina_old", + "entity": "light.luce_cucina", "name": "Luce Cucina", "type": "tile" }, { - "entity": "light.luce_divano", + "entity": "light.luce_vetrine", + "name": "Luce Vetrine", + "type": "tile" + }, + { + "entity": "group.lights_livingroom", + "name": "Luci Sala", + "type": "tile" + }, + { + "features": [ + { + "type": "light-brightness" + } + ], + "entity": "light.luce_sala", + "name": "Luce Sala", + "type": "tile" + }, + { + "entity": "light.luce_divano", "name": "Luce Divano", "type": "tile", "features": [ @@ -568,25 +801,55 @@ ] }, { - "entity": "group.lights_bathroom_old", + "entity": "light.luce_studio", + "name": "Luce Studio", + "type": "tile" + }, + { + "entity": "light.luce_zona_notte", + "name": "Luce Zona Notte", + "type": "tile" + }, + { + "entity": "group.lights_bathroom", "name": "Luci Bagno", "type": "tile" }, { - "entity": "light.luce_bagno_old", + "entity": "light.luce_bagno", "name": "Luce Bagno", "type": "tile" }, { - "entity": "light.luce_specchio_old", + "entity": "light.luce_specchio", "name": "Luce Specchio", "type": "tile" }, + { + "entity": "light.luce_trono", + "name": "Luce Cucina", + "type": "tile" + }, + { + "features": [ + { + "type": "light-brightness" + } + ], + "entity": "light.luce_camera", + "name": "Luce Camera", + "type": "tile" + }, { "entity": "light.luce_dispensa", "name": "Luce Dispensa", "type": "tile" }, + { + "entity": "light.luce_balcone", + "name": "Luce Balcone", + "type": "tile" + }, { "entity": "light.luce_veranda", "name": "Luce Veranda", @@ -597,28 +860,68 @@ { "icon": "mdi:window-shutter", "id": "covers", - "title": "Tapparelle Old", - "path": "covers_old", + "title": "Tapparelle", + "path": "covers", "badges": [ { "type": "entity", "show_name": true, "show_state": true, "show_icon": true, - "entity": "cover.tapparella_cucina_old", + "entity": "cover.tapparella_cucina_grande", "color": "", - "state_content": "current_position", - "name": "Cucina" + "name": "Cucina Grande", + "state_content": "current_position" }, { "type": "entity", "show_name": true, "show_state": true, "show_icon": true, - "entity": "cover.tapparella_sala_old", + "entity": "cover.tapparella_cucina_piccola", "color": "", - "state_content": "current_position", - "name": "Sala" + "name": "Cucina Piccola", + "state_content": "current_position" + }, + { + "type": "entity", + "show_name": true, + "show_state": true, + "show_icon": true, + "entity": "cover.tapparella_sala", + "color": "", + "name": "Sala", + "state_content": "current_position" + }, + { + "type": "entity", + "show_name": true, + "show_state": true, + "show_icon": true, + "entity": "cover.tapparella_studio", + "color": "", + "name": "Studio", + "state_content": "current_position" + }, + { + "type": "entity", + "show_name": true, + "show_state": true, + "show_icon": true, + "entity": "cover.tapparella_bagno", + "color": "", + "name": "Bagno", + "state_content": "current_position" + }, + { + "type": "entity", + "show_name": true, + "show_state": true, + "show_icon": true, + "entity": "cover.tapparella_camera", + "color": "", + "name": "Camera", + "state_content": "current_position" } ], "cards": [ @@ -626,8 +929,8 @@ "entities": [ { "buttons_position": "left", - "entity": "cover.tapparella_cucina_old", - "name": "Tapparella Cucina", + "entity": "cover.tapparella_cucina_grande", + "name": "Tapparella Cucina Grande", "always_percentage": true } ], @@ -637,205 +940,217 @@ "entities": [ { "buttons_position": "left", - "entity": "cover.tapparella_sala_old", + "entity": "cover.tapparella_cucina_piccola", + "name": "Tapparella Cucina Piccola", + "always_percentage": true + } + ], + "type": "custom:shutter-card" + }, + { + "entities": [ + { + "buttons_position": "left", + "entity": "cover.tapparella_sala", "name": "Tapparella Sala", "always_percentage": true } ], "type": "custom:shutter-card" + }, + { + "entities": [ + { + "buttons_position": "left", + "entity": "cover.tapparella_studio", + "name": "Tapparella Studio", + "always_percentage": true + } + ], + "type": "custom:shutter-card" + }, + { + "entities": [ + { + "buttons_position": "left", + "entity": "cover.tapparella_bagno", + "name": "Tapparella Bagno", + "always_percentage": true + } + ], + "type": "custom:shutter-card" + }, + { + "entities": [ + { + "buttons_position": "left", + "entity": "cover.tapparella_camera", + "name": "Tapparella Camera", + "always_percentage": true + } + ], + "type": "custom:shutter-card" } ] }, { - "type": "sections", - "max_columns": 3, - "title": "Principale", - "path": "main", + "theme": "Backend-selected", "icon": "mdi:home", - "sections": [ + "id": "main_old", + "title": "Principale Old", + "path": "main_old", + "type": "sections", + "badges": [ { - "type": "grid", - "cards": [ - { - "type": "heading", - "heading_style": "subtitle" - }, - { - "type": "picture-glance", - "aspect_ratio": "0%", - "entities": [ - { - "entity": "light.luce_zona_giorno" - }, - { - "entity": "light.luce_armadio" - } - ], - "entity": "light.luce_zona_giorno", - "state_image": { - "off": "/local/images/rooms/corridoio_off.jpg", - "on": "/local/images/rooms/corridoio_on.jpg" - }, - "title": "Zona Giorno" - }, - { - "type": "picture-glance", - "aspect_ratio": "0%", - "entities": [ - { - "entity": "light.luce_cucina" - }, - { - "entity": "light.luce_vetrine" - }, - { - "entity": "cover.tapparella_cucina_grande" - }, - { - "entity": "cover.tapparella_cucina_piccola" - }, - { - "entity": "climate.cucina" - }, - { - "entity": "media_player.google_home" - } - ], - "entity": "group.lights_kitchen", - "state_image": { - "off": "/local/images/rooms/cucina_off.jpg", - "on": "/local/images/rooms/cucina_on.jpg" - }, - "title": "Cucina" - }, - { - "type": "picture-glance", - "aspect_ratio": "0%", - "entities": [ - { - "entity": "light.luce_sala" - }, - { - "entity": "light.luce_divano" - }, - { - "entity": "cover.tapparella_sala" - }, - { - "entity": "climate.sala" - }, - { - "entity": "media_player.sony_kd_55xf8596" - } - ], - "entity": "group.lights_livingroom", - "state_image": { - "off": "/local/images/rooms/sala_off.jpg", - "on": "/local/images/rooms/sala_on.jpg" - }, - "title": "Sala" - }, - { - "type": "picture-glance", - "aspect_ratio": "0%", - "entities": [ - { - "entity": "light.luce_studio" - }, - { - "entity": "cover.tapparella_studio" - }, - { - "entity": "climate.studio" - } - ], - "entity": "light.luce_studio", - "state_image": { - "off": "/local/images/rooms/studio_off.jpg", - "on": "/local/images/rooms/studio_on.jpg" - }, - "title": "Studio" - }, + "type": "entity", + "show_name": false, + "show_state": true, + "show_icon": true, + "entity": "person.giorgio", + "color": "", + "show_entity_picture": true + }, + { + "type": "entity", + "show_name": false, + "show_state": true, + "show_icon": true, + "entity": "person.laura", + "color": "", + "show_entity_picture": true + }, + { + "type": "entity", + "show_name": false, + "show_state": true, + "show_icon": true, + "entity": "device_tracker.ff590mr_device_tracker", + "color": "", + "show_entity_picture": true + }, + { + "type": "entity", + "entity": "sensor.time" + }, + { + "type": "entity", + "show_name": false, + "show_state": false, + "show_icon": true, + "entity": "binary_sensor.porta_casa_contact", + "color": "", + "show_entity_picture": true + }, + { + "type": "entity", + "show_name": false, + "show_state": false, + "show_icon": true, + "entity": "binary_sensor.home_mode", + "color": "" + }, + { + "type": "entity", + "show_name": false, + "show_state": false, + "show_icon": true, + "entity": "binary_sensor.guard_mode", + "color": "" + }, + { + "type": "entity", + "show_name": false, + "show_state": false, + "show_icon": true, + "entity": "binary_sensor.speech_notifications", + "color": "" + }, + { + "type": "entity", + "show_name": false, + "show_state": false, + "show_icon": true, + "entity": "binary_sensor.alarms", + "color": "" + }, + { + "type": "entity", + "show_name": false, + "show_state": false, + "show_icon": true, + "entity": "binary_sensor.central_heating", + "color": "" + }, + { + "type": "entity", + "show_name": false, + "show_state": true, + "show_icon": true, + "entity": "sensor.shelly_em_old_channel_1_power", + "color": "" + }, + { + "type": "entity", + "show_name": true, + "show_state": true, + "show_icon": true, + "entity": "sensor.temperatura_balcone_temperature", + "color": "", + "name": "Balcone" + }, + { + "type": "entity", + "show_name": true, + "show_state": true, + "show_icon": true, + "entity": "sensor.temperatura_veranda_temperature", + "color": "", + "name": "Veranda" + } + ], + "cards": [], + "sections": [ + { + "type": "grid", + "cards": [ { "type": "picture-glance", "aspect_ratio": "0%", "entities": [ { - "entity": "light.luce_zona_notte" + "entity": "light.luce_corridoio" } ], - "entity": "light.luce_zona_notte", + "entity": "light.luce_corridoio", "state_image": { "off": "/local/images/rooms/corridoio_off.jpg", "on": "/local/images/rooms/corridoio_on.jpg" }, - "title": "Zona Notte" + "title": "Corridoio" }, { "type": "picture-glance", "aspect_ratio": "0%", "entities": [ { - "entity": "light.luce_bagno" - }, - { - "entity": "light.luce_specchio" - }, - { - "entity": "light.luce_trono" + "entity": "light.luce_cucina_old" }, { - "entity": "cover.tapparella_bagno" + "entity": "cover.tapparella_cucina_old" }, { "entity": "climate.bagno_grande" - } - ], - "entity": "group.lights_bathroom", - "state_image": { - "off": "/local/images/rooms/bagno_off.jpg", - "on": "/local/images/rooms/bagno_on.jpg" - }, - "title": "Bagno Grande" - }, - { - "type": "picture-glance", - "aspect_ratio": "0%", - "entities": [ - { - "entity": "light.luce_camera" - }, - { - "entity": "cover.tapparella_camera" - }, - { - "entity": "climate.camera" }, { - "entity": "media_player.tv_camera" - } - ], - "entity": "light.luce_camera", - "state_image": { - "off": "/local/images/rooms/camera_off.jpg", - "on": "/local/images/rooms/camera_on.jpg" - }, - "title": "Camera" - }, - { - "type": "picture-glance", - "aspect_ratio": "0%", - "entities": [ - { - "entity": "light.luce_balcone" + "entity": "media_player.google_home" } ], - "entity": "light.luce_balcone", + "entity": "light.luce_cucina_old", "state_image": { - "off": "/local/images/rooms/balcone_off.jpg", - "on": "/local/images/rooms/balcone_on.jpg" + "off": "/local/images/rooms/cucina_off.jpg", + "on": "/local/images/rooms/cucina_on.jpg" }, - "title": "Balcone" + "title": "Cucina" }, { "type": "custom:clock-weather-card", @@ -861,7 +1176,7 @@ { "type": "custom:mini-graph-card", "entities": [ - "sensor.shelly_em_channel_1_power" + "sensor.shelly_em_old_channel_1_power" ], "hours_to_show": 24, "points_per_hour": 120, @@ -953,615 +1268,145 @@ "decimals": 0 } ] - } - ] - }, - { - "type": "vertical-stack", - "cards": [ - { - "type": "custom:mushroom-title-card", - "title": "Modalità Casa" - }, - { - "type": "horizontal-stack", - "cards": [ - { - "type": "custom:mushroom-entity-card", - "entity": "input_boolean.home_mode_day", - "tap_action": { - "action": "toggle" - }, - "layout": "vertical" - }, - { - "type": "custom:mushroom-entity-card", - "entity": "input_boolean.home_mode_night", - "tap_action": { - "action": "toggle" - }, - "layout": "vertical" - } - ] - }, - { - "type": "horizontal-stack", - "cards": [ - { - "type": "custom:mushroom-entity-card", - "entity": "input_boolean.home_mode_away", - "tap_action": { - "action": "toggle" - }, - "layout": "vertical" - }, - { - "type": "custom:mushroom-entity-card", - "entity": "input_boolean.guard_mode", - "tap_action": { - "action": "toggle" - }, - "layout": "vertical", - "name": "Guardia" - } - ] - } - ] - }, - { - "type": "vertical-stack", - "cards": [ - { - "type": "custom:mushroom-title-card", - "title": "Controlli Vari" - }, - { - "type": "entities", - "show_header_toggle": false, - "entities": [ - { - "entity": "script.speech_status" - }, - { - "entity": "script.homeassistant_restart" - }, - { - "entity": "automation.risveglio_giorgio" - }, - { - "entity": "select.netatmo_casa_ravera_testa" - } - ] - }, - { - "type": "entity-filter", - "title": "Eventi da Segnalare", - "entities": [ - "group.alarms", - "group.update", - "binary_sensor.ff590mr_engine_light_warning", - "binary_sensor.ff590mr_warning_brakefluid", - "binary_sensor.ff590mr_warning_washwater", - "binary_sensor.ff590mr_warning_coolantlevellow" - ], - "state_filter": [ - "on" - ], - "show_empty": false - }, - { - "type": "entities", - "title": "Eventi", - "show_header_toggle": false, - "entities": [ - { - "entity": "input_datetime.away_mode_end" - } - ] - } - ] - } - ], - "column_span": 3 - } - ], - "dense_section_placement": false, - "cards": [], - "badges": [ - { - "type": "entity", - "show_name": false, - "show_state": true, - "show_icon": true, - "entity": "person.giorgio", - "color": "", - "show_entity_picture": true - }, - { - "type": "entity", - "show_name": false, - "show_state": true, - "show_icon": true, - "entity": "person.laura", - "color": "", - "show_entity_picture": true - }, - { - "type": "entity", - "show_name": false, - "show_state": true, - "show_icon": true, - "entity": "device_tracker.ff590mr_device_tracker", - "color": "", - "show_entity_picture": true - }, - { - "type": "entity", - "entity": "sensor.time" - }, - { - "type": "entity", - "show_name": false, - "show_state": false, - "show_icon": true, - "entity": "binary_sensor.porta_casa_contact", - "color": "", - "show_entity_picture": true - }, - { - "type": "entity", - "show_name": false, - "show_state": false, - "show_icon": true, - "entity": "binary_sensor.home_mode", - "color": "" - }, - { - "type": "entity", - "show_name": false, - "show_state": false, - "show_icon": true, - "entity": "binary_sensor.guard_mode", - "color": "" - }, - { - "type": "entity", - "show_name": false, - "show_state": false, - "show_icon": true, - "entity": "binary_sensor.speech_notifications", - "color": "" - }, - { - "type": "entity", - "show_name": false, - "show_state": false, - "show_icon": true, - "entity": "binary_sensor.alarms", - "color": "" - }, - { - "type": "entity", - "show_name": false, - "show_state": false, - "show_icon": true, - "entity": "binary_sensor.central_heating", - "color": "" - }, - { - "type": "entity", - "entity": "sensor.shelly_em_channel_1_power" - }, - { - "type": "entity", - "show_name": true, - "show_state": true, - "show_icon": true, - "entity": "sensor.temperatura_balcone_temperature", - "color": "", - "name": "Balcone" - }, - { - "type": "entity", - "show_name": true, - "show_state": true, - "show_icon": true, - "entity": "sensor.temperatura_veranda_temperature", - "color": "", - "name": "Veranda" - } - ] - }, - { - "theme": "Backend-selected", - "icon": "mdi:lightbulb", - "id": "lights", - "title": "Luci", - "path": "lights", - "badges": [ - { - "type": "entity", - "show_name": true, - "show_state": false, - "show_icon": true, - "entity": "light.luce_zona_giorno", - "color": "", - "name": "Zona Giorno", - "tap_action": { - "action": "toggle" - } - }, - { - "type": "entity", - "show_name": true, - "show_state": false, - "show_icon": true, - "entity": "light.luce_armadio", - "color": "", - "name": "Armadio", - "tap_action": { - "action": "toggle" - } - }, - { - "type": "entity", - "show_name": true, - "show_state": false, - "show_icon": true, - "entity": "light.luce_cucina", - "color": "", - "name": "Cucina", - "tap_action": { - "action": "toggle" - } - }, - { - "type": "entity", - "show_name": true, - "show_state": false, - "show_icon": true, - "entity": "light.luce_vetrine", - "color": "", - "name": "Vetrine", - "tap_action": { - "action": "toggle" - } - }, - { - "type": "entity", - "show_name": true, - "show_state": false, - "show_icon": true, - "entity": "light.luce_sala", - "color": "", - "name": "Sala", - "tap_action": { - "action": "toggle" - } - }, - { - "type": "entity", - "show_name": true, - "show_state": false, - "show_icon": true, - "entity": "light.luce_divano", - "color": "", - "name": "Divano", - "tap_action": { - "action": "toggle" - } - }, - { - "type": "entity", - "show_name": true, - "show_state": false, - "show_icon": true, - "entity": "light.luce_studio", - "color": "", - "name": "Studio", - "tap_action": { - "action": "toggle" - } - }, - { - "type": "entity", - "show_name": true, - "show_state": false, - "show_icon": true, - "entity": "light.luce_zona_notte", - "color": "", - "name": "Zona Notte", - "tap_action": { - "action": "toggle" - } - }, - { - "type": "entity", - "show_name": true, - "show_state": false, - "show_icon": true, - "entity": "light.luce_bagno", - "color": "", - "name": "Bagno", - "tap_action": { - "action": "toggle" - } - }, - { - "type": "entity", - "show_name": true, - "show_state": false, - "show_icon": true, - "entity": "light.luce_specchio", - "color": "", - "name": "Specchio", - "tap_action": { - "action": "toggle" - } - }, - { - "type": "entity", - "show_name": true, - "show_state": false, - "show_icon": true, - "entity": "light.luce_trono", - "color": "", - "name": "Trono", - "tap_action": { - "action": "toggle" - } - }, - { - "type": "entity", - "show_name": true, - "show_state": false, - "show_icon": true, - "entity": "light.luce_camera", - "color": "", - "name": "Camera", - "tap_action": { - "action": "toggle" - } - }, - { - "type": "entity", - "show_name": true, - "show_state": false, - "show_icon": true, - "entity": "light.luce_balcone", - "color": "", - "name": "Balcone", - "tap_action": { - "action": "toggle" - } - } - ], - "cards": [ - { - "entities": [ - { - "entity": "group.lights" - }, - { - "entity": "light.luce_zona_giorno" - }, - { - "entity": "light.luce_armadio" - }, - { - "type": "custom:fold-entity-row", - "head": "group.lights_kitchen", - "entities": [ - "light.luce_cucina", - "light.luce_vetrine" - ] - }, - { - "type": "custom:fold-entity-row", - "head": "group.lights_livingroom", - "entities": [ - "light.luce_sala", - "light.luce_divano" - ] - }, - { - "entity": "light.luce_studio" - }, - { - "entity": "light.luce_zona_notte" - }, - { - "type": "custom:fold-entity-row", - "head": "group.lights_bathroom", - "entities": [ - "light.luce_bagno", - "light.luce_specchio", - "light.luce_trono" - ] - }, - { - "entity": "light.luce_camera" - }, - { - "entity": "light.luce_balcone" - } - ], - "show_header_toggle": false, - "title": "Comandi luci", - "type": "entities" - }, - { - "entity": "group.lights", - "name": "Luci Casa", - "type": "tile" - }, - { - "entity": "light.luce_zona_giorno", - "name": "Luce Zona Giorno", - "type": "tile" - }, - { - "entity": "light.luce_armadio", - "name": "Luce Armadio", - "type": "tile" - }, - { - "entity": "light.luce_cucina", - "name": "Luce Cucina", - "type": "tile" - }, - { - "entity": "light.luce_vetrine", - "name": "Luce Vetrine", - "type": "tile" - }, - { - "entity": "group.lights_livingroom", - "name": "Luci Sala", - "type": "tile" - }, - { - "features": [ - { - "type": "light-brightness" - } - ], - "entity": "light.luce_sala", - "name": "Luce Sala", - "type": "tile" - }, - { - "entity": "light.luce_divano", - "name": "Luce Divano", - "type": "tile", - "features": [ - { - "type": "light-brightness" - } - ] - }, - { - "entity": "light.luce_studio", - "name": "Luce Studio", - "type": "tile" - }, - { - "entity": "light.luce_zona_notte", - "name": "Luce Zona Notte", - "type": "tile" - }, - { - "entity": "group.lights_bathroom", - "name": "Luci Bagno", - "type": "tile" - }, - { - "entity": "light.luce_bagno", - "name": "Luce Bagno", - "type": "tile" - }, - { - "entity": "light.luce_specchio", - "name": "Luce Specchio", - "type": "tile" - }, - { - "entity": "light.luce_trono", - "name": "Luce Cucina", - "type": "tile" - }, - { - "features": [ + } + ] + }, { - "type": "light-brightness" + "type": "vertical-stack", + "cards": [ + { + "type": "custom:mushroom-title-card", + "title": "Modalità Casa" + }, + { + "type": "horizontal-stack", + "cards": [ + { + "type": "custom:mushroom-entity-card", + "entity": "input_boolean.home_mode_day", + "tap_action": { + "action": "toggle" + }, + "layout": "vertical" + }, + { + "type": "custom:mushroom-entity-card", + "entity": "input_boolean.home_mode_night", + "tap_action": { + "action": "toggle" + }, + "layout": "vertical" + } + ] + }, + { + "type": "horizontal-stack", + "cards": [ + { + "type": "custom:mushroom-entity-card", + "entity": "input_boolean.home_mode_away", + "tap_action": { + "action": "toggle" + }, + "layout": "vertical" + }, + { + "type": "custom:mushroom-entity-card", + "entity": "input_boolean.guard_mode", + "tap_action": { + "action": "toggle" + }, + "layout": "vertical", + "name": "Guardia" + } + ] + } + ] + }, + { + "type": "vertical-stack", + "cards": [ + { + "type": "custom:mushroom-title-card", + "title": "Controlli Vari" + }, + { + "type": "entities", + "show_header_toggle": false, + "entities": [ + { + "entity": "script.speech_status" + }, + { + "entity": "script.homeassistant_restart" + }, + { + "entity": "automation.risveglio_giorgio" + }, + { + "entity": "select.netatmo_casa_ravera_testa" + } + ] + }, + { + "type": "entity-filter", + "title": "Eventi da Segnalare", + "entities": [ + "group.alarms", + "group.update", + "binary_sensor.ff590mr_engine_light_warning", + "binary_sensor.ff590mr_warning_brakefluid", + "binary_sensor.ff590mr_warning_washwater", + "binary_sensor.ff590mr_warning_coolantlevellow" + ], + "state_filter": [ + "on" + ], + "show_empty": false + }, + { + "type": "entities", + "title": "Eventi", + "show_header_toggle": false, + "entities": [ + { + "entity": "input_datetime.away_mode_end" + } + ] + } + ] } ], - "entity": "light.luce_camera", - "name": "Luce Camera", - "type": "tile" - }, - { - "entity": "light.luce_dispensa", - "name": "Luce Dispensa", - "type": "tile" - }, - { - "entity": "light.luce_balcone", - "name": "Luce Balcone", - "type": "tile" - }, - { - "entity": "light.luce_veranda", - "name": "Luce Veranda", - "type": "tile" + "column_span": 3 } - ] + ], + "max_columns": 3 }, { "icon": "mdi:window-shutter", "id": "covers", - "title": "Tapparelle", - "path": "covers", + "title": "Tapparelle Old", + "path": "covers_old", "badges": [ { "type": "entity", "show_name": true, "show_state": true, "show_icon": true, - "entity": "cover.tapparella_cucina_grande", - "color": "", - "name": "Cucina Grande", - "state_content": "current_position" - }, - { - "type": "entity", - "show_name": true, - "show_state": true, - "show_icon": true, - "entity": "cover.tapparella_cucina_piccola", - "color": "", - "name": "Cucina Piccola", - "state_content": "current_position" - }, - { - "type": "entity", - "show_name": true, - "show_state": true, - "show_icon": true, - "entity": "cover.tapparella_sala", - "color": "", - "name": "Sala", - "state_content": "current_position" - }, - { - "type": "entity", - "show_name": true, - "show_state": true, - "show_icon": true, - "entity": "cover.tapparella_studio", - "color": "", - "name": "Studio", - "state_content": "current_position" - }, - { - "type": "entity", - "show_name": true, - "show_state": true, - "show_icon": true, - "entity": "cover.tapparella_bagno", + "entity": "cover.tapparella_cucina_old", "color": "", - "name": "Bagno", - "state_content": "current_position" + "state_content": "current_position", + "name": "Cucina" }, { "type": "entity", "show_name": true, "show_state": true, "show_icon": true, - "entity": "cover.tapparella_camera", + "entity": "cover.tapparella_sala_old", "color": "", - "name": "Camera", - "state_content": "current_position" + "state_content": "current_position", + "name": "Sala" } ], "cards": [ @@ -1569,19 +1414,8 @@ "entities": [ { "buttons_position": "left", - "entity": "cover.tapparella_cucina_grande", - "name": "Tapparella Cucina Grande", - "always_percentage": true - } - ], - "type": "custom:shutter-card" - }, - { - "entities": [ - { - "buttons_position": "left", - "entity": "cover.tapparella_cucina_piccola", - "name": "Tapparella Cucina Piccola", + "entity": "cover.tapparella_cucina_old", + "name": "Tapparella Cucina", "always_percentage": true } ], @@ -1591,45 +1425,12 @@ "entities": [ { "buttons_position": "left", - "entity": "cover.tapparella_sala", + "entity": "cover.tapparella_sala_old", "name": "Tapparella Sala", "always_percentage": true } ], "type": "custom:shutter-card" - }, - { - "entities": [ - { - "buttons_position": "left", - "entity": "cover.tapparella_studio", - "name": "Tapparella Studio", - "always_percentage": true - } - ], - "type": "custom:shutter-card" - }, - { - "entities": [ - { - "buttons_position": "left", - "entity": "cover.tapparella_bagno", - "name": "Tapparella Bagno", - "always_percentage": true - } - ], - "type": "custom:shutter-card" - }, - { - "entities": [ - { - "buttons_position": "left", - "entity": "cover.tapparella_camera", - "name": "Tapparella Camera", - "always_percentage": true - } - ], - "type": "custom:shutter-card" } ] }, @@ -2636,23 +2437,6 @@ "position": "sidebar" } }, - { - "entity": "sensor.shelly_em_old_channel_1_power", - "max": 6000, - "min": 0, - "name": "Potenza Istantanea", - "severity": { - "green": 0, - "yellow": 2000, - "red": 3500 - }, - "type": "gauge", - "unit": "W", - "needle": true, - "view_layout": { - "position": "sidebar" - } - }, { "type": "gauge", "entity": "sensor.consumo_energetico_giornaliero", @@ -2690,8 +2474,7 @@ { "type": "custom:plotly-graph", "entities": [ - "sensor.shelly_em_channel_1_power", - "sensor.shelly_em_old_channel_1_power" + "sensor.shelly_em_channel_1_power" ], "hours_to_show": 24, "refresh_interval": 0, @@ -2742,12 +2525,6 @@ }, { "entity": "sensor.consumo_energetico_mensile" - }, - { - "entity": "sensor.consumo_energetico_giornaliero_old" - }, - { - "entity": "sensor.consumo_energetico_mensile_old" } ], "title": "Consumi", diff --git a/automations/day.yaml b/automations/day.yaml index 4333bcae..950eb29e 100644 --- a/automations/day.yaml +++ b/automations/day.yaml @@ -25,7 +25,9 @@ - action: cover.set_cover_position data: entity_id: - - cover.tapparella_cucina_old + - cover.tapparella_cucina_grande + - cover.tapparella_cucina_piccola #- cover.tapparella_sala - - cover.tapparella_studio + #- cover.tapparella_studio + - cover.tapparella_bagno position: 85 diff --git a/automations/doors.yaml b/automations/doors.yaml index 402ebda6..2d590b69 100644 --- a/automations/doors.yaml +++ b/automations/doors.yaml @@ -31,6 +31,5 @@ action: - delay: 00:00:01 - action: light.turn_on - entity_id: light.luce_corridoio - #entity:id: light.luce_zona_giorno + entity_id: light.luce_zona_giorno - delay: '00:05:00' diff --git a/automations/energy.yaml b/automations/energy.yaml index ba30c2c3..69a33f5c 100644 --- a/automations/energy.yaml +++ b/automations/energy.yaml @@ -8,10 +8,7 @@ trigger: - trigger: numeric_state entity_id: sensor.shelly_em_channel_1_power - above: 3200 - - trigger: numeric_state - entity_id: sensor.shelly_em_old_channel_1_power - above: 3200 + above: 3300 action: action: script.notify_all diff --git a/components/amazon_alexa/covers.yaml b/components/amazon_alexa/covers.yaml index e771e5fe..bf202a19 100644 --- a/components/amazon_alexa/covers.yaml +++ b/components/amazon_alexa/covers.yaml @@ -2,9 +2,8 @@ # Amazon Alexa: Covers ###################################################################### -- cover.tapparella_cucina_old -#- cover.tapparella_cucina_grande -#- cover.tapparella_cucina_piccola +- cover.tapparella_cucina_grande +- cover.tapparella_cucina_piccola - cover.tapparella_sala - cover.tapparella_studio - cover.tapparella_bagno diff --git a/components/amazon_alexa/lights.yaml b/components/amazon_alexa/lights.yaml index dbc804a0..528d174e 100644 --- a/components/amazon_alexa/lights.yaml +++ b/components/amazon_alexa/lights.yaml @@ -5,14 +5,14 @@ - light.luce_corridoio - light.luce_zona_giorno - light.luce_armadio - - light.luce_cucina_old + - light.luce_cucina - light.luce_vetrine - light.luce_sala - light.luce_divano - light.luce_studio - light.luce_zona_notte - - light.luce_bagno_old - - light.luce_specchio_old + - light.luce_bagno + - light.luce_specchio - light.luce_trono - light.luce_camera - light.luce_dispensa diff --git a/components/google_assistant/covers.yaml b/components/google_assistant/covers.yaml index c68efb74..57c71f46 100644 --- a/components/google_assistant/covers.yaml +++ b/components/google_assistant/covers.yaml @@ -2,15 +2,12 @@ # Google Assistant: Covers ###################################################################### -cover.tapparella_cucina_old: +cover.tapparella_cucina_grande: + expose: true + room: Cucina +cover.tapparella_cucina_piccola: expose: true room: Cucina -#cover.tapparella_cucina_grande: -# expose: true -# room: Cucina -#cover.tapparella_cucina_piccola: -# expose: true -# room: Cucina cover.tapparella_sala: expose: true room: Sala diff --git a/components/google_assistant/lights.yaml b/components/google_assistant/lights.yaml index a24df7e4..aa1e6bc7 100644 --- a/components/google_assistant/lights.yaml +++ b/components/google_assistant/lights.yaml @@ -11,7 +11,7 @@ light.luce_zona_giorno: light.luce_armadio: expose: true room: Zona Giorno -light.luce_cucina_old: +light.luce_cucina: expose: true room: Cucina light.luce_vetrine: @@ -29,10 +29,10 @@ light.luce_studio: light.luce_zona_notte: expose: true room: Zona Notte -light.luce_bagno_old: +light.luce_bagno: expose: true room: Bagno -light.luce_specchio_old: +light.luce_specchio: expose: true room: Bagno light.luce_trono: diff --git a/components/homekit.yaml b/components/homekit.yaml index 9c10d4a7..3fd80c60 100644 --- a/components/homekit.yaml +++ b/components/homekit.yaml @@ -8,9 +8,8 @@ name: Casa Ravera-Testa filter: include_entities: # Covers - - cover.tapparella_cucina_old - #- cover.tapparella_cucina_grande - #- cover.tapparella_cucina_piccola + - cover.tapparella_cucina_grande + - cover.tapparella_cucina_piccola - cover.tapparella_sala - cover.tapparella_studio - cover.tapparella_bagno @@ -19,14 +18,14 @@ filter: - light.luce_corridoio - light.luce_zona_giorno - light.luce_armadio - - light.luce_cucina_old + - light.luce_cucina #- light.luce_vetrine - light.luce_sala - light.luce_divano - light.luce_studio - light.luce_zona_notte - - light.luce_bagno_old - - light.luce_specchio_old + - light.luce_bagno + - light.luce_specchio - light.luce_camera - light.luce_dispensa - light.luce_balcone @@ -36,6 +35,7 @@ filter: - sensor.temperatura_veranda_temperature # TV - media_player.sony_kd_55xf8596 + - media_player.tv_cucina - media_player.tv_camera # Home Assistant Controls - input_boolean.home_mode_away diff --git a/customizations/energy.yaml b/customizations/energy.yaml index 4b05a217..46ddd829 100644 --- a/customizations/energy.yaml +++ b/customizations/energy.yaml @@ -8,12 +8,6 @@ sensor.consumo_energetico_giornaliero: sensor.consumo_energetico_mensile: friendly_name: Consumo Energetico Mensile -sensor.consumo_energetico_giornaliero_old: - friendly_name: Consumo Energetico Giornaliero (Old) - -sensor.consumo_energetico_mensile_old: - friendly_name: Consumo Energetico Mensile (Old) - sensor.electricity_maps_intensita_della_co2: friendly_name: "CO2: Intensità di carbonio" diff --git a/groups/covers.yaml b/groups/covers.yaml index efd2c196..73a902eb 100644 --- a/groups/covers.yaml +++ b/groups/covers.yaml @@ -2,14 +2,6 @@ # Group Covers ###################################################################### -covers_old: - name: Tapparelle (Old) - #icon: mdi:window-closed - icon: mdi:window-shutter - entities: - - cover.tapparella_cucina_old - - cover.tapparella_sala_old - covers: name: Tapparelle icon: mdi:window-shutter diff --git a/groups/lights.yaml b/groups/lights.yaml index 9d971b66..38a89bf7 100644 --- a/groups/lights.yaml +++ b/groups/lights.yaml @@ -2,18 +2,6 @@ # Group Lights ###################################################################### -lights_old: - name: Luci Casa (Old) - icon: mdi:lightbulb - entities: - - light.luce_corridoio - - light.luce_cucina_old - - light.luce_divano - - light.luce_bagno_old - - light.luce_specchio_old - - light.luce_dispensa - - light.luce_veranda - lights: name: Luci Casa icon: mdi:lightbulb diff --git a/groups/lights_bathroom.yaml b/groups/lights_bathroom.yaml index 3444d69f..498b8725 100644 --- a/groups/lights_bathroom.yaml +++ b/groups/lights_bathroom.yaml @@ -2,13 +2,6 @@ # Group Lights Bathroom ###################################################################### -lights_bathroom_old: - name: Luci Bagno (Old) - icon: mdi:lightbulb - entities: - - light.luce_bagno_old - - light.luce_specchio_old - lights_bathroom: name: Luci Bagno icon: mdi:lightbulb diff --git a/log/logbook.yaml b/log/logbook.yaml index f32b0824..0b8f4afc 100644 --- a/log/logbook.yaml +++ b/log/logbook.yaml @@ -50,8 +50,6 @@ exclude: # Energy Sensors - sensor.consumo_energetico_giornaliero - sensor.consumo_energetico_mensile - - sensor.consumo_energetico_giornaliero_old - - sensor.consumo_energetico_mensile_old # Climatizzatore - sensor.climatizzatore_zona_giorno_energia - sensor.climatizzatore_zona_giorno_temperatura_ambiente diff --git a/log/recorder.yaml b/log/recorder.yaml index c37797a1..bde82373 100644 --- a/log/recorder.yaml +++ b/log/recorder.yaml @@ -52,8 +52,6 @@ exclude: # Energy Sensors - sensor.consumo_energetico_giornaliero - sensor.consumo_energetico_mensile - - sensor.consumo_energetico_giornaliero_old - - sensor.consumo_energetico_mensile_old # Climatizzatore - sensor.climatizzatore_zona_giorno_energia - sensor.climatizzatore_zona_giorno_temperatura_ambiente diff --git a/packages/shelly/shelly_customizations.yaml b/packages/shelly/shelly_customizations.yaml index afe0fbf6..f9c42d9f 100644 --- a/packages/shelly/shelly_customizations.yaml +++ b/packages/shelly/shelly_customizations.yaml @@ -45,112 +45,6 @@ homeassistant: button.shelly_em_reboot: friendly_name: Riavvia Dispositivo - # Shelly 1 - Tapparella Cucina (shellyswitch_55980f) - sensor.tapparella_old_cucina_energy: - friendly_name: Energia - sensor.tapparella_old_cucina_power: - friendly_name: Potenza - binary_sensor.tapparella_cucina_old_channel_1_input: - friendly_name: Pulsante 1 - binary_sensor.tapparella_cucina_old_channel_2_input: - friendly_name: Pulsante 2 - binary_sensor.tapparella_cucina_old_cloud: - friendly_name: Connessione Cloud - update.tapparella_cucina_old_firmware: - friendly_name: Aggiornamento Firmware - update.tapparella_cucina_old_beta_firmware_update: - friendly_name: Aggiornamento Firmware Beta - sensor.tapparella_cucina_old_rssi: - friendly_name: Potenza Segnale - sensor.tapparella_cucina_old_uptime: - friendly_name: Uptime - button.tapparella_cucina_old_reboot: - friendly_name: Riavvia Dispositivo - - # Shelly 2 - Tapparella Sala (shellyswitch25_7457d8) - sensor.tapparella_sala_old_energy: - friendly_name: Energia - sensor.tapparella_sala_old_power: - friendly_name: Potenza - binary_sensor.tapparella_sala_old_channel_1_input: - friendly_name: Pulsante 1 - binary_sensor.tapparella_sala_old_channel_2_input: - friendly_name: Pulsante 2 - binary_sensor.tapparella_sala_old_cloud: - friendly_name: Connessione Cloud - sensor.tapparella_sala_old_device_temperature: - friendly_name: Temperatura Device - binary_sensor.tapparella_sala_old_overheating: - friendly_name: Surriscaldamento Device - update.tapparella_sala_old_firmware: - friendly_name: Aggiornamento Firmware - update.tapparella_sala_old_beta_firmware_update: - friendly_name: Aggiornamento Firmware Beta - sensor.tapparella_sala_old_rssi: - friendly_name: Potenza Segnale - sensor.tapparella_sala_old_uptime: - friendly_name: Uptime - button.tapparella_sala_old_reboot: - friendly_name: Riavvia Dispositivo - - # Shelly 5 - Luce Corridoio (shelly1_24d1ee) - binary_sensor.luce_corridoio_cloud: - friendly_name: Connessione Cloud - update.luce_corridoio_firmware_update: - friendly_name: Aggiornamento Firmware - update.luce_corridoio_beta_firmware_update: - friendly_name: Aggiornamento Firmware Beta - sensor.luce_corridoio_rssi: - friendly_name: Potenza Segnale - sensor.luce_corridoio_uptime: - friendly_name: Uptime - button.luce_corridoio_reboot: - friendly_name: Riavvia Dispositivo - - # Shelly 6 - Luce Cucina (shelly1_93B27D) - binary_sensor.luce_cucina_old_cloud: - friendly_name: Connessione Cloud - update.luce_cucina_old_firmware: - friendly_name: Aggiornamento Firmware - update.luce_cucina_old_beta_firmware_update: - friendly_name: Aggiornamento Firmware Beta - sensor.luce_cucina_old_rssi: - friendly_name: Potenza Segnale - sensor.luce_cucina_old_uptime: - friendly_name: Uptime - button.luce_cucina_old_reboot: - friendly_name: Riavvia Dispositivo - - # Shelly 8 - Luci Bagno (shellyswitch25_C45BBE6C38D0) - sensor.luce_bagno_old_energy: - friendly_name: Energia - sensor.luce_bagno_old_power: - friendly_name: Potenza - binary_sensor.luce_bagno_old_overpowering: - friendly_name: Sovraccarico Energetico - sensor.luce_specchio_old_energy: - friendly_name: Energia - sensor.luce_specchio_old_power: - friendly_name: Potenza - binary_sensor.luce_specchio_old_overpowering: - friendly_name: Sovraccarico Energetico - binary_sensor.luci_bagno_cloud: - friendly_name: Connessione Cloud - sensor.luci_bagno_device_temperature: - friendly_name: Temperatura Device - binary_sensor.luci_bagno_overheating: - friendly_name: Surriscaldamento Device - update.luci_bagno_firmware: - friendly_name: Aggiornamento Firmware - update.luci_bagno_beta_firmware_update: - friendly_name: Aggiornamento Firmware Beta - sensor.luci_bagno_rssi: - friendly_name: Potenza Segnale - sensor.luci_bagno_uptime: - friendly_name: Uptime - button.luci_bagno_reboot: - friendly_name: Riavvia Dispositivo - # Shelly Bulb (shellybulb_bc8610) binary_sensor.luce_divano_cloud: friendly_name: Connessione Cloud diff --git a/packages/shelly/shelly_groups.yaml b/packages/shelly/shelly_groups.yaml index 79bf9283..a4fec5b0 100644 --- a/packages/shelly/shelly_groups.yaml +++ b/packages/shelly/shelly_groups.yaml @@ -8,10 +8,4 @@ group: icon: mdi:alpha-s-box entities: - update.shelly_em_firmware_update - - update.tapparella_cucina_old_firmware - - update.tapparella_sala_old_firmware - - update.luce_corridoio_firmware_update - - update.luce_cucina_old_firmware - - update.luci_bagno_firmware #- update.luce_divano_firmware_update - - update.shelly_em_old_firmware_update diff --git a/packages/shelly/shelly_log.yaml b/packages/shelly/shelly_log.yaml index e7b2f4f1..b478a848 100644 --- a/packages/shelly/shelly_log.yaml +++ b/packages/shelly/shelly_log.yaml @@ -53,19 +53,6 @@ logbook: - update.luce_cucina_old_firmware - sensor.luce_cucina_old_rssi - sensor.luce_cucina_old_uptime - # Shelly 8 - Luci Bagno (shellyswitch25_7457d8) - - sensor.luce_bagno_old_energy - - binary_sensor.luce_bagno_old_overpowering - - sensor.luce_bagno_old_power - - sensor.luce_specchio_old_energy - - binary_sensor.luce_specchio_old_overpowering - - sensor.luce_specchio_old_power - - binary_sensor.luci_bagno_cloud - - sensor.luci_bagno_device_temperature - - binary_sensor.luci_bagno_overheating - - update.luci_bagno_firmware - - sensor.luci_bagno_rssi - - sensor.luci_bagno_uptime # Shelly Bulb (shellybulb_bc8610) - binary_sensor.luce_divano_cloud - update.luce_divano_firmware_update @@ -145,19 +132,6 @@ recorder: - update.luce_cucina_old_firmware - sensor.luce_cucina_old_rssi - sensor.luce_cucina_old_uptime - # Shelly 8 - Luci Bagno (shellyswitch25_7457d8) - - sensor.luce_bagno_old_energy - - binary_sensor.luce_bagno_old_overpowering - - sensor.luce_bagno_old_power - - sensor.luce_specchio_old_energy - - binary_sensor.luce_specchio_old_overpowering - - sensor.luce_specchio_old_power - - binary_sensor.luci_bagno_cloud - - sensor.luci_bagno_device_temperature - - binary_sensor.luci_bagno_overheating - - update.luci_bagno_firmware - - sensor.luci_bagno_rssi - - sensor.luci_bagno_uptime # Shelly Bulb (shellybulb_bc8610) - binary_sensor.luce_divano_cloud - update.luce_divano_firmware_update diff --git a/shell_scripts/shelly_reboot.sh b/shell_scripts/shelly_reboot.sh index f56231cb..4aaf6df6 100755 --- a/shell_scripts/shelly_reboot.sh +++ b/shell_scripts/shelly_reboot.sh @@ -9,13 +9,7 @@ USER=$(awk '/shelly_user/ { print $2 }' $HASS_HOME/secrets.yaml) PASSWORD=$(awk '/shelly_password/ { print $2 }' $HASS_HOME/secrets.yaml) SHELLY_ID=( shellyem.giorgioravera.it - shelly1.giorgioravera.it - shelly2.giorgioravera.it - shelly5.giorgioravera.it - shelly6.giorgioravera.it - shelly8.giorgioravera.it shellybulb.giorgioravera.it - shellyem-old.giorgioravera.it shellyplugs.giorgioravera.it ) diff --git a/shell_scripts/shelly_upgrade.sh b/shell_scripts/shelly_upgrade.sh index 9b669f76..429b3d9f 100755 --- a/shell_scripts/shelly_upgrade.sh +++ b/shell_scripts/shelly_upgrade.sh @@ -10,13 +10,7 @@ USER=$(awk '/mqtt_user/ { print $2 }' $HASS_HOME/secrets.yaml) PASSWORD=$(awk '/mqtt_password/ { print $2 }' $HASS_HOME/secrets.yaml) SHELLY_ID=( shellyem-B9F0D0 - shellyswitch-55980F - shellyswitch25-6919BD - shelly1-24D1EE - shelly1-93B27D - shellyswitch25-C45BBE6C38D0 shellybulb-BC8610 - shellyem-B9E1A0 shellyplug-s-7A31CB ) diff --git a/shell_scripts/shelly_uptime.sh b/shell_scripts/shelly_uptime.sh index 7a94fa98..e8d86c75 100755 --- a/shell_scripts/shelly_uptime.sh +++ b/shell_scripts/shelly_uptime.sh @@ -9,13 +9,7 @@ USER=$(awk '/shelly_user/ { print $2 }' $HASS_HOME/secrets.yaml) PASSWORD=$(awk '/shelly_password/ { print $2 }' $HASS_HOME/secrets.yaml) SHELLY_ID=( shellyem.giorgioravera.it - shelly1.giorgioravera.it - shelly2.giorgioravera.it - shelly5.giorgioravera.it - shelly6.giorgioravera.it - shelly8.giorgioravera.it shellybulb.giorgioravera.it - shellyem-old.giorgioravera.it shellyplugs.giorgioravera.it ) diff --git a/shell_scripts/shelly_version.sh b/shell_scripts/shelly_version.sh index 77a9f318..4a33a092 100755 --- a/shell_scripts/shelly_version.sh +++ b/shell_scripts/shelly_version.sh @@ -9,13 +9,7 @@ USER=$(awk '/shelly_user/ { print $2 }' $HASS_HOME/secrets.yaml) PASSWORD=$(awk '/shelly_password/ { print $2 }' $HASS_HOME/secrets.yaml) SHELLY_ID=( shellyem.giorgioravera.it - shelly1.giorgioravera.it - shelly2.giorgioravera.it - shelly5.giorgioravera.it - shelly6.giorgioravera.it - shelly8.giorgioravera.it shellybulb.giorgioravera.it - shellyem-old.giorgioravera.it shellyplugs.giorgioravera.it ) diff --git a/template_messages/speech.yaml b/template_messages/speech.yaml index ff30000f..6b4c67b5 100644 --- a/template_messages/speech.yaml +++ b/template_messages/speech.yaml @@ -80,7 +80,7 @@ {# Lights Status #} {%- macro status_lights() -%} - {% for entity_id in states.group.lights_old.attributes.entity_id %} + {% for entity_id in states.group.lights.attributes.entity_id %} {% set name = state_attr(entity_id, 'friendly_name') %} {% if is_state(entity_id, 'off') %} La {{ name }} è spenta. @@ -92,7 +92,7 @@ {# Covers Status #} {%- macro status_covers() -%} - {% for entity_id in states.group.covers_old.attributes.entity_id %} + {% for entity_id in states.group.covers.attributes.entity_id %} {% set name = state_attr(entity_id, 'friendly_name') %} {% set perc = state_attr(entity_id, 'current_position') %} {% if perc | int < 25 %} diff --git a/utility_meter/energy.yaml b/utility_meter/energy.yaml index 92cd3319..5967fe72 100644 --- a/utility_meter/energy.yaml +++ b/utility_meter/energy.yaml @@ -9,11 +9,3 @@ consumo_energetico_giornaliero: consumo_energetico_mensile: source: sensor.shelly_em_channel_1_energy cycle: monthly - -consumo_energetico_giornaliero_old: - source: sensor.shelly_em_old_channel_1_energy - cycle: daily - -consumo_energetico_mensile_old: - source: sensor.shelly_em_old_channel_1_energy - cycle: monthly -- 2.47.3