Removed shelly 3 4, 10, 11

diff --git a/automations/day.yaml b/automations/day.yaml
index 64030fc6cd3bc0063b547b2002f6f7614ddc6593..4333bcaed50021c779cdb2aa1730f7214b0ae1b2 100644 (file)
--- 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 ab0adfb8c714d548c32b511a5da3d75984747eef..e771e5fe81eafa0c85584f0a1b9b06febe2fd827 100644 (file)
--- 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 dba9d25cfcd7459f66b70ff0a0dd9d49e229360b..dbc804a07e60c84cb9ca7e0530385ac361c01514 100644 (file)
--- 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 bdecb3a5f40414064e3f0d14e5586c34b31ecfd9..c68efb747b30b583d5e791144acaace12cce48db 100644 (file)
--- 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 7a37345bae06db800d747c6a63df30a2edea7d27..a24df7e4f8a71f9546e398d58588ba33986233ce 100644 (file)
--- 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 2b0f769cc89e5b9a5bc4413b4f158b055fac4b80..9c10d4a7a62d28a3d55aebc001b1246ef73ff217 100644 (file)
--- 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 18bdec2eafcb68a18f4adf45f8b7395c21003983..efd2c19674ea24c253e90503ac4e8ecba2328168 100644 (file)
--- 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 760045fea0361dc44f58e7369c91a6a1fbecf47f..9d971b669530567d252a65cc371839f7bfceacef 100644 (file)
--- 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 b6a5834c54691dbbfcdbb608c5ae4f6c3c951ba2..afe0fbf60d7c504c6a123f11606cf8625530a1db 100644 (file)
--- 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 edda46799ae7852a5fd56469445909bb9dc350d0..79bf9283942332b28d25e9d1a93d62b45f0e1257 100644 (file)
--- 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 eb36c08a02385026b0fd39d271415865a22d04ca..e7b2f4f1d64e2025b08a6287ec597c124fa9674f 100644 (file)
--- 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 93fdefc152315b8f58b591d16a9c4ec3407ac76b..f56231cb12e2bfbe014ab62185a1e6016c0e9ce4 100755 (executable)
--- 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 913f2b034958ad986336b0ee518703a7a5892127..9b669f763fe78cc3e440e8613bb07fc7e5cd5be9 100755 (executable)
--- 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 e1369a91a0852634dd03a809fda379dca5d723a1..7a94fa9849659fa248690450e78096b3bf57b996 100755 (executable)
--- 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 0e64d479b40f6533e60d8255665786b7e84e594b..77a9f31882220fce08a0972d3d97687beeae330a 100755 (executable)
--- 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
 )