From f4dad54db2c6ea4a31df73a049b284d1f58d4b26 Mon Sep 17 00:00:00 2001 From: Giorgio Ravera Date: Thu, 12 Dec 2024 21:09:12 +0100 Subject: [PATCH] Removed shelly 3 4, 10, 11 --- automations/day.yaml | 4 +- components/amazon_alexa/covers.yaml | 9 ++- components/amazon_alexa/lights.yaml | 4 +- components/google_assistant/covers.yaml | 12 +-- components/google_assistant/lights.yaml | 4 +- components/homekit.yaml | 19 +++-- groups/covers.yaml | 2 - groups/lights.yaml | 2 - packages/shelly/shelly_customizations.yaml | 86 ---------------------- packages/shelly/shelly_groups.yaml | 4 - packages/shelly/shelly_log.yaml | 70 ------------------ shell_scripts/shelly_reboot.sh | 4 - shell_scripts/shelly_upgrade.sh | 4 - shell_scripts/shelly_uptime.sh | 4 - shell_scripts/shelly_version.sh | 9 +-- 15 files changed, 31 insertions(+), 206 deletions(-) diff --git a/automations/day.yaml b/automations/day.yaml index 64030fc6..4333bcae 100644 --- a/automations/day.yaml +++ b/automations/day.yaml @@ -26,6 +26,6 @@ data: entity_id: - cover.tapparella_cucina_old - #- cover.tapparella_sala_old - - cover.tapparella_studio_old + #- cover.tapparella_sala + - cover.tapparella_studio position: 85 diff --git a/components/amazon_alexa/covers.yaml b/components/amazon_alexa/covers.yaml index ab0adfb8..e771e5fe 100644 --- a/components/amazon_alexa/covers.yaml +++ b/components/amazon_alexa/covers.yaml @@ -3,6 +3,9 @@ ###################################################################### - cover.tapparella_cucina_old -- cover.tapparella_sala_old -- cover.tapparella_studio_old -- cover.tapparella_camera_old +#- cover.tapparella_cucina_grande +#- cover.tapparella_cucina_piccola +- cover.tapparella_sala +- cover.tapparella_studio +- cover.tapparella_bagno +- cover.tapparella_camera diff --git a/components/amazon_alexa/lights.yaml b/components/amazon_alexa/lights.yaml index dba9d25c..dbc804a0 100644 --- a/components/amazon_alexa/lights.yaml +++ b/components/amazon_alexa/lights.yaml @@ -14,7 +14,7 @@ - light.luce_bagno_old - light.luce_specchio_old - light.luce_trono - - light.luce_camera_old + - light.luce_camera - light.luce_dispensa - - light.luce_balcone_old + - light.luce_balcone - light.luce_veranda diff --git a/components/google_assistant/covers.yaml b/components/google_assistant/covers.yaml index bdecb3a5..c68efb74 100644 --- a/components/google_assistant/covers.yaml +++ b/components/google_assistant/covers.yaml @@ -11,15 +11,15 @@ cover.tapparella_cucina_old: #cover.tapparella_cucina_piccola: # expose: true # room: Cucina -cover.tapparella_sala_old: +cover.tapparella_sala: expose: true room: Sala -cover.tapparella_studio_old: +cover.tapparella_studio: expose: true room: Studio -#cover.tapparella_bagno: -# expose: true -# room: Bagno -cover.tapparella_camera_old: +cover.tapparella_bagno: + expose: true + room: Bagno +cover.tapparella_camera: expose: true room: Camera diff --git a/components/google_assistant/lights.yaml b/components/google_assistant/lights.yaml index 7a37345b..a24df7e4 100644 --- a/components/google_assistant/lights.yaml +++ b/components/google_assistant/lights.yaml @@ -38,13 +38,13 @@ light.luce_specchio_old: light.luce_trono: expose: true room: Bagno -light.luce_camera_old: +light.luce_camera: expose: true room: Camera light.luce_dispensa: expose: true room: Dispensa -light.luce_balcone_old: +light.luce_balcone: expose: true room: Balcone light.luce_veranda: diff --git a/components/homekit.yaml b/components/homekit.yaml index 2b0f769c..9c10d4a7 100644 --- a/components/homekit.yaml +++ b/components/homekit.yaml @@ -9,24 +9,27 @@ filter: include_entities: # Covers - cover.tapparella_cucina_old - - cover.tapparella_sala_old - - cover.tapparella_studio_old - - cover.tapparella_camera_old + #- cover.tapparella_cucina_grande + #- cover.tapparella_cucina_piccola + - cover.tapparella_sala + - cover.tapparella_studio + - cover.tapparella_bagno + - cover.tapparella_camera # Lights - light.luce_corridoio - #- light.luce_zona_giorno - #- light.luce_armadio + - light.luce_zona_giorno + - light.luce_armadio - light.luce_cucina_old #- light.luce_vetrine - light.luce_sala - light.luce_divano - light.luce_studio - #- light.luce_zona_notte + - light.luce_zona_notte - light.luce_bagno_old - light.luce_specchio_old - - light.luce_camera_old + - light.luce_camera - light.luce_dispensa - - light.luce_balcone_old + - light.luce_balcone - light.luce_veranda # Sensors - sensor.temperatura_balcone_temperature diff --git a/groups/covers.yaml b/groups/covers.yaml index 18bdec2e..efd2c196 100644 --- a/groups/covers.yaml +++ b/groups/covers.yaml @@ -9,8 +9,6 @@ covers_old: entities: - cover.tapparella_cucina_old - cover.tapparella_sala_old - - cover.tapparella_studio_old - - cover.tapparella_camera_old covers: name: Tapparelle diff --git a/groups/lights.yaml b/groups/lights.yaml index 760045fe..9d971b66 100644 --- a/groups/lights.yaml +++ b/groups/lights.yaml @@ -11,9 +11,7 @@ lights_old: - light.luce_divano - light.luce_bagno_old - light.luce_specchio_old - - light.luce_camera_old - light.luce_dispensa - - light.luce_balcone_old - light.luce_veranda lights: diff --git a/packages/shelly/shelly_customizations.yaml b/packages/shelly/shelly_customizations.yaml index b6a5834c..afe0fbf6 100644 --- a/packages/shelly/shelly_customizations.yaml +++ b/packages/shelly/shelly_customizations.yaml @@ -93,50 +93,6 @@ homeassistant: button.tapparella_sala_old_reboot: friendly_name: Riavvia Dispositivo - # Shelly 3 - Tapparella Studio (shellyswitch_13572b) - sensor.tapparella_studio_old_energy: - friendly_name: Energia - sensor.tapparella_studio_old_power: - friendly_name: Potenza - binary_sensor.tapparella_studio_old_channel_1_input: - friendly_name: Pulsante 1 - binary_sensor.tapparella_studio_old_channel_2_input: - friendly_name: Pulsante 2 - binary_sensor.tapparella_studio_old_cloud: - friendly_name: Connessione Cloud - update.tapparella_studio_old_firmware: - friendly_name: Aggiornamento Firmware - update.tapparella_studio_old_beta_firmware_update: - friendly_name: Aggiornamento Firmware Beta - sensor.tapparella_studio_old_rssi: - friendly_name: Potenza Segnale - sensor.tapparella_studio_old_uptime: - friendly_name: Uptime - button.tapparella_studio_old_reboot: - friendly_name: Riavvia Dispositivo - - # Shelly 4 - Tapparella Camera (shellyswitch_559c49) - sensor.tapparella_camera_old_energy: - friendly_name: Energia - sensor.tapparella_camera_old_power: - friendly_name: Potenza - binary_sensor.tapparella_camera_old_channel_1_input: - friendly_name: Pulsante 1 - binary_sensor.tapparella_camera_old_channel_2_input: - friendly_name: Pulsante 2 - binary_sensor.tapparella_camera_old_cloud: - friendly_name: Connessione Cloud - update.tapparella_camera_old_firmware: - friendly_name: Aggiornamento Firmware - update.tapparella_camera_old_beta_firmware_update: - friendly_name: Aggiornamento Firmware Beta - sensor.tapparella_camera_old_rssi: - friendly_name: Potenza Segnale - sensor.tapparella_camera_old_uptime: - friendly_name: Uptime - button.tapparella_camera_old_reboot: - friendly_name: Riavvia Dispositivo - # Shelly 5 - Luce Corridoio (shelly1_24d1ee) binary_sensor.luce_corridoio_cloud: friendly_name: Connessione Cloud @@ -195,48 +151,6 @@ homeassistant: button.luci_bagno_reboot: friendly_name: Riavvia Dispositivo - # Shelly 10 - Luce Camera (shellydimmer_d46cf2) - binary_sensor.luce_camera_old_channel_1_input: - friendly_name: Pulsante 1 - binary_sensor.luce_camera_old_channel_2_input: - friendly_name: Pulsante 2 - sensor.luce_camera_old_energy: - friendly_name: Energia - sensor.luce_camera_old_power: - friendly_name: Potenza - binary_sensor.luce_camera_old_overpowering: - friendly_name: Sovraccarico Energetico - binary_sensor.luce_camera_old_cloud: - friendly_name: Connessione Cloud - sensor.luce_camera_old_device_temperature: - friendly_name: Temperatura Device - binary_sensor.luce_camera_old_overheating: - friendly_name: Surriscaldamento Device - update.luce_camera_old_firmware: - friendly_name: Aggiornamento Firmware - update.luce_camera_old_beta_firmware_update: - friendly_name: Aggiornamento Firmware Beta - sensor.luce_camera_old_rssi: - friendly_name: Potenza Segnale - sensor.luce_camera_old_uptime: - friendly_name: Uptime - button.luce_camera_old_reboot: - friendly_name: Riavvia Dispositivo - - # Shelly 11 - Luce Balcone (shelly1_c423c8) - binary_sensor.luce_balcone_old_cloud: - friendly_name: Connessione Cloud - update.luce_balcone_old_firmware: - friendly_name: Aggiornamento Firmware - update.luce_balcone_old_beta_firmware_update: - friendly_name: Aggiornamento Firmware Beta - sensor.luce_balcone_old_rssi: - friendly_name: Potenza Segnale - sensor.luce_balcone_old_uptime: - friendly_name: Uptime - button.luce_balcone_old_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 edda4679..79bf9283 100644 --- a/packages/shelly/shelly_groups.yaml +++ b/packages/shelly/shelly_groups.yaml @@ -10,12 +10,8 @@ group: - update.shelly_em_firmware_update - update.tapparella_cucina_old_firmware - update.tapparella_sala_old_firmware - - update.tapparella_studio_old_firmware - - update.tapparella_camera_old_firmware - update.luce_corridoio_firmware_update - update.luce_cucina_old_firmware - update.luci_bagno_firmware - - update.luce_camera_old_firmware - - update.luce_balcone_old_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 eb36c08a..e7b2f4f1 100644 --- a/packages/shelly/shelly_log.yaml +++ b/packages/shelly/shelly_log.yaml @@ -43,24 +43,6 @@ logbook: - update.tapparella_sala_old_firmware - sensor.tapparella_sala_old_rssi - sensor.tapparella_sala_old_uptime - # Shelly 3 - Tapparella Studio (shellyswitch_13572b) - - sensor.tapparella_studio_old_energy - - sensor.tapparella_studio_old_power - - binary_sensor.tapparella_studio_old_channel_1_input - - binary_sensor.tapparella_studio_old_channel_2_input - - binary_sensor.tapparella_studio_old_cloud - - update.tapparella_studio_old_firmware - - sensor.tapparella_studio_old_rssi - - sensor.tapparella_studio_old_uptime - # Shelly 4 - Tapparella Camera (shellyswitch_559c49) - - sensor.tapparella_camera_old_energy - - sensor.tapparella_camera_old_power - - binary_sensor.tapparella_camera_old_channel_1_input - - binary_sensor.tapparella_camera_old_channel_2_input - - binary_sensor.tapparella_camera_old_cloud - - update.tapparella_camera_old_firmware - - sensor.tapparella_camera_old_rssi - - sensor.tapparella_camera_old_uptime # Shelly 5 - Luce Corridoio (shelly1_24d1ee) - binary_sensor.luce_corridoio_cloud - update.luce_corridoio_firmware_update @@ -84,23 +66,6 @@ logbook: - update.luci_bagno_firmware - sensor.luci_bagno_rssi - sensor.luci_bagno_uptime - # Shelly 10 - Luce Camera (shellydimmer_d46cf2) - - binary_sensor.luce_camera_old_channel_1_input - - binary_sensor.luce_camera_old_channel_2_input - - sensor.luce_camera_old_energy - - sensor.luce_camera_old_power - - binary_sensor.luce_camera_old_overpowering - - binary_sensor.luce_camera_old_cloud - - sensor.luce_camera_old_device_temperature - - binary_sensor.luce_camera_old_overheating - - update.luce_camera_old_firmware - - sensor.luce_camera_old_rssi - - sensor.luce_camera_old_uptime - # Shelly 11 - Luce Balcone (shelly1_c423c8) - - binary_sensor.luce_balcone_old_cloud - - update.luce_balcone_old_firmware - - sensor.luce_balcone_old_rssi - - sensor.luce_balcone_old_uptime # Shelly Bulb (shellybulb_bc8610) - binary_sensor.luce_divano_cloud - update.luce_divano_firmware_update @@ -170,24 +135,6 @@ recorder: - update.tapparella_sala_old_firmware - sensor.tapparella_sala_old_rssi - sensor.tapparella_sala_old_uptime - # Shelly 3 - Tapparella Studio (shellyswitch_13572b) - - sensor.tapparella_studio_old_energy - - sensor.tapparella_studio_old_power - - binary_sensor.tapparella_studio_old_channel_1_input - - binary_sensor.tapparella_studio_old_channel_2_input - - binary_sensor.tapparella_studio_old_cloud - - update.tapparella_studio_old_firmware - - sensor.tapparella_studio_old_rssi - - sensor.tapparella_studio_old_uptime - # Shelly 4 - Tapparella Camera (shellyswitch_559c49) - - sensor.tapparella_camera_old_energy - - sensor.tapparella_camera_old_power - - binary_sensor.tapparella_camera_old_channel_1_input - - binary_sensor.tapparella_camera_old_channel_2_input - - binary_sensor.tapparella_camera_old_cloud - - update.tapparella_camera_old_firmware - - sensor.tapparella_camera_old_rssi - - sensor.tapparella_camera_old_uptime # Shelly 5 - Luce Corridoio (shelly1_24d1ee) - binary_sensor.luce_corridoio_cloud - update.luce_corridoio_firmware_update @@ -211,23 +158,6 @@ recorder: - update.luci_bagno_firmware - sensor.luci_bagno_rssi - sensor.luci_bagno_uptime - # Shelly 10 - Luce Camera (shellydimmer_d46cf2) - - binary_sensor.luce_camera_old_channel_1_input - - binary_sensor.luce_camera_old_channel_2_input - - sensor.luce_camera_old_energy - - sensor.luce_camera_old_power - - binary_sensor.luce_camera_old_overpowering - - binary_sensor.luce_camera_old_cloud - - sensor.luce_camera_old_device_temperature - - binary_sensor.luce_camera_old_overheating - - update.luce_camera_old_firmware - - sensor.luce_camera_old_rssi - - sensor.luce_camera_old_uptime - # Shelly 11 - Luce Balcone (shelly1_c423c8) - - binary_sensor.luce_balcone_old_cloud - - update.luce_balcone_old_firmware - - sensor.luce_balcone_old_rssi - - sensor.luce_balcone_old_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 93fdefc1..f56231cb 100755 --- a/shell_scripts/shelly_reboot.sh +++ b/shell_scripts/shelly_reboot.sh @@ -11,13 +11,9 @@ SHELLY_ID=( shellyem.giorgioravera.it shelly1.giorgioravera.it shelly2.giorgioravera.it - shelly3.giorgioravera.it - shelly4.giorgioravera.it shelly5.giorgioravera.it shelly6.giorgioravera.it shelly8.giorgioravera.it - shelly10.giorgioravera.it - shelly11.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 913f2b03..9b669f76 100755 --- a/shell_scripts/shelly_upgrade.sh +++ b/shell_scripts/shelly_upgrade.sh @@ -12,13 +12,9 @@ SHELLY_ID=( shellyem-B9F0D0 shellyswitch-55980F shellyswitch25-6919BD - shellyswitch-13572B - shellyswitch-559C49 shelly1-24D1EE shelly1-93B27D shellyswitch25-C45BBE6C38D0 - shellydimmer-D46CF2 - shelly1-C423C8 shellybulb-BC8610 shellyem-B9E1A0 shellyplug-s-7A31CB diff --git a/shell_scripts/shelly_uptime.sh b/shell_scripts/shelly_uptime.sh index e1369a91..7a94fa98 100755 --- a/shell_scripts/shelly_uptime.sh +++ b/shell_scripts/shelly_uptime.sh @@ -11,13 +11,9 @@ SHELLY_ID=( shellyem.giorgioravera.it shelly1.giorgioravera.it shelly2.giorgioravera.it - shelly3.giorgioravera.it - shelly4.giorgioravera.it shelly5.giorgioravera.it shelly6.giorgioravera.it shelly8.giorgioravera.it - shelly10.giorgioravera.it - shelly11.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 0e64d479..77a9f318 100755 --- a/shell_scripts/shelly_version.sh +++ b/shell_scripts/shelly_version.sh @@ -8,19 +8,14 @@ fi 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 - shelly3.giorgioravera.it - shelly4.giorgioravera.it shelly5.giorgioravera.it shelly6.giorgioravera.it - shelly7.giorgioravera.it shelly8.giorgioravera.it - shelly9.giorgioravera.it - shelly10.giorgioravera.it - shelly11.giorgioravera.it shellybulb.giorgioravera.it - shellyem.giorgioravera.it + shellyem-old.giorgioravera.it shellyplugs.giorgioravera.it ) -- 2.47.3