Updates

aneisch · May 3, 2024 · f9e803b · f9e803b
1 parent 20fcb84
commit f9e803b
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 [![Build Status](https://github.com/aneisch/home-assistant-config/actions/workflows/check-ha-release-compatibility.yml/badge.svg)](https://github.com/aneisch/home-assistant-config/actions)
 [![GitHub last commit](https://img.shields.io/github/last-commit/aneisch/home-assistant-config)](https://github.com/aneisch/home-assistant-config/commits/master)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/y/aneisch/home-assistant-config)](https://github.com/aneisch/home-assistant-config/graphs/commit-activity)
-[![HA Version](https://img.shields.io/badge/Running%20Home%20Assistant%20-2024.5.0b0%20(Out%20of%20Date)-Red)](https://github.com/home-assistant/home-assistant/releases/latest)
+[![HA Version](https://img.shields.io/badge/Running%20Home%20Assistant-2024.5.0%20(Latest)-brightgreen)](https://github.com/home-assistant/home-assistant/releases/latest)
 <br><a href="https://www.buymeacoffee.com/aneisch" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/default-black.png" width="150px" height="35px" alt="Buy Me A Coffee" style="height: 35px !important;width: 150px !important;" ></a>
 
 
@@ -57,17 +57,17 @@ Also using Grafana/Influx for graphing, both running in Docker containers on NUC
 Description | value
 -- | --
 Lines of ESPHome YAML | 2801
-Lines of Home Assistant YAML | 9010
+Lines of Home Assistant YAML | 9031
 [Integrations](https://www.home-assistant.io/integrations/) in use | 60
 Zigbee devices in [`zha`](https://www.home-assistant.io/integrations/zha/) | 26
 Z-Wave devices in [`zwave_js`](https://www.home-assistant.io/integrations/zwave_js/) | 37
 
 Description | value
 -- | --
 Entities in the [`automation`](https://www.home-assistant.io/components/automation) domain | 121
-Entities in the [`binary_sensor`](https://www.home-assistant.io/components/binary_sensor) domain | 139
+Entities in the [`binary_sensor`](https://www.home-assistant.io/components/binary_sensor) domain | 137
 Entities in the [`button`](https://www.home-assistant.io/components/button) domain | 15
-Entities in the [`camera`](https://www.home-assistant.io/components/camera) domain | 14
+Entities in the [`camera`](https://www.home-assistant.io/components/camera) domain | 15
 Entities in the [`climate`](https://www.home-assistant.io/components/climate) domain | 1
 Entities in the [`conversation`](https://www.home-assistant.io/components/conversation) domain | 1
 Entities in the [`counter`](https://www.home-assistant.io/components/counter) domain | 1
@@ -90,7 +90,7 @@ Entities in the [`plant`](https://www.home-assistant.io/components/plant) domain
 Entities in the [`remote`](https://www.home-assistant.io/components/remote) domain | 1
 Entities in the [`script`](https://www.home-assistant.io/components/script) domain | 56
 Entities in the [`select`](https://www.home-assistant.io/components/select) domain | 3
-Entities in the [`sensor`](https://www.home-assistant.io/components/sensor) domain | 429
+Entities in the [`sensor`](https://www.home-assistant.io/components/sensor) domain | 417
 Entities in the [`siren`](https://www.home-assistant.io/components/siren) domain | 1
 Entities in the [`sun`](https://www.home-assistant.io/components/sun) domain | 1
 Entities in the [`switch`](https://www.home-assistant.io/components/switch) domain | 167
@@ -100,7 +100,7 @@ Entities in the [`update`](https://www.home-assistant.io/components/update) doma
 Entities in the [`vacuum`](https://www.home-assistant.io/components/vacuum) domain | 1
 Entities in the [`weather`](https://www.home-assistant.io/components/weather) domain | 1
 Entities in the [`zone`](https://www.home-assistant.io/components/zone) domain | 6
-**Total state objects** | **1217**
+**Total state objects** | **1204**
 ## The HACS integrations/plugins that I use:
 **Appdaemon**:<br>
 [aneisch/follow_me_appdaemon](https://github.com/aneisch/follow_me_appdaemon)<br>

diff --git a/camera.yaml b/camera.yaml
@@ -7,6 +7,11 @@
   file_path: /config/images/mail_and_packages/overlay.png
   name: mail_usps
 
+- platform: local_file
+  file_path: /config/media/images/logo.jpg
+  name: usps_vehicle
+
+
 #- platform: mjpeg
 #  mjpeg_url: http://10.0.0.26:8080/?action=stream
 #  name: Outdoor

diff --git a/custom_components/sonoff/core/devices.py b/custom_components/sonoff/core/devices.py
@@ -111,6 +111,7 @@ def spec(cls, base: str = None, enabled: bool = None, **kwargs) -> type:
 LED = spec(XToggle, param="sledOnline", uid="led", enabled=False)
 RSSI = spec(XSensor, param="rssi", enabled=False)
 PULSE = spec(XToggle, param="pulse", enabled=False)
+ZRSSI = spec(XSensor, param="subDevRssi", uid="rssi", enabled=False)
 
 SPEC_SWITCH = [XSwitch, LED, RSSI, PULSE, XPulseWidth]
 SPEC_1CH = [Switch1, LED, RSSI]
@@ -272,13 +273,13 @@ def spec(cls, base: str = None, enabled: bool = None, **kwargs) -> type:
         ),
         spec(
             XEnergySensorDualR3,
-            param="kwhHistories_01",
+            param="kwhHistories_02",
             uid="energy_3",
             get_params={"getKwh_02": 2},
         ),
         spec(
             XEnergySensorDualR3,
-            param="kwhHistories_01",
+            param="kwhHistories_03",
             uid="energy_4",
             get_params={"getKwh_03": 2},
         ),
@@ -398,13 +399,16 @@ def spec(cls, base: str = None, enabled: bool = None, **kwargs) -> type:
         XRemoteButton,
         Battery,
     ],
+    # https://github.com/AlexxIT/SonoffLAN/issues/1398
+    7004: [XSwitch, ZRSSI],  # ZBMINIL2
     # https://github.com/AlexxIT/SonoffLAN/issues/1283
     7006: [XZigbeeCover, spec(XSensor, param="battery")],
     7014: [
         spec(XSensor100, param="temperature"),
         spec(XSensor100, param="humidity"),
         Battery,
     ],  # https://github.com/AlexxIT/SonoffLAN/issues/1166
+    7016: [ZRSSI],  # SNZB-06P
 }
 
 

diff --git a/custom_components/sonoff/core/ewelink/__init__.py b/custom_components/sonoff/core/ewelink/__init__.py
@@ -158,12 +158,15 @@ async def send_bulk(self, device: XDevice, params: dict):
                         break
                 else:
                     device["params_bulk"]["switches"].append(new)
-            return
+        else:
+            device["params_bulk"] = params
 
-        device["params_bulk"] = params
         await asyncio.sleep(0.1)
 
-        return await self.send(device, device.pop("params_bulk"))
+        # this can be called from different threads/loops
+        # https://github.com/AlexxIT/SonoffLAN/issues/1368
+        if params := device.pop("params_bulk", None):
+            return await self.send(device, params)
 
     async def send_cloud(self, device: XDevice, params: dict = None, query=True):
         if not self.can_cloud(device):

diff --git a/custom_components/sonoff/manifest.json b/custom_components/sonoff/manifest.json
@@ -15,5 +15,5 @@
   "requirements": [
     "pycryptodome>=3.6.6"
   ],
-  "version": "3.7.2"
+  "version": "3.7.3"
 }
diff --git a/custom_components/sonoff/translations/sk.json b/custom_components/sonoff/translations/sk.json
@@ -12,7 +12,8 @@
         "description": "Zadajte Vaše [eWeLink účet](https://www.ewelink.cc/en/) poverenia",
         "data": {
           "username": "E-mail alebo telefón (v režime DIY použite ľubovoľný)",
-          "password": "Heslo (pre DIY režim nechajte prázdne)"
+          "password": "Heslo (pre DIY režim nechajte prázdne)",
+          "country_code": "Kód krajiny (pre automatický výber nechajte prázdne)"
         }
       }
     }

diff --git a/extras/Node-RED/flows.json b/extras/Node-RED/flows.json
diff --git a/extras/docker-compose/homeassistant/docker-compose.yml b/extras/docker-compose/homeassistant/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.2'
 services:
     homeassistant:
         container_name: homeassistant
-        image: ghcr.io/home-assistant/home-assistant:beta
+        image: ghcr.io/home-assistant/home-assistant:stable
         labels:
             - com.centurylinklabs.watchtower.monitor-only=true
             # HTTPS for CF

diff --git a/extras/docker-compose/unified/docker-compose.yml b/extras/docker-compose/unified/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.2'
 services:
     homeassistant:
         container_name: homeassistant
-        image: ghcr.io/home-assistant/home-assistant:beta
+        image: ghcr.io/home-assistant/home-assistant:stable
         labels:
             - com.centurylinklabs.watchtower.monitor-only=true
             # HTTPS for CF
@@ -21,7 +21,6 @@ services:
             - traefik.http.routers.assist_local.service=assist
         volumes:
             - /opt/homeassistant:/config
-            #- /opt/nginx-proxy-manager/database.sqlite:/tmp/database.sqlite
             - /var/run/docker.sock:/var/run/docker.sock
             - /home/aneisch/symlinks_for_rsync/hass-docker-ssh:/root/.ssh:ro
             - /tmp/radar.gif:/tmp/radar.gif
@@ -702,7 +701,6 @@ services:
             - EXTRA=-display none -vnc 0.0.0.0:99,password-secret=secvnc0 -object secret,id=secvnc0,data=vncpass
             - TZ=America/Chicago
             - ADDITIONAL_PORTS=hostfwd=tcp::1234-:1234,
-
         devices:
             - /dev/kvm
         user: root
@@ -750,7 +748,6 @@ services:
             - traefik.http.routers.go2rtc_local.tls.certResolver=le-home
             - traefik.http.routers.go2rtc_local.tls.domains[0].main=*.home.domain.com
             - traefik.http.routers.go2rtc_local.rule=Host(`go2rtc.home.domain.com`)
-
         environment:
             - PLUS_API_KEY=secret
             - TZ=America/Chicago
@@ -861,6 +858,6 @@ services:
         volumes:
             - '/var/run/docker.sock:/var/run/docker.sock'
 
-networks:
-    macos_network:
-        driver: bridge
+# networks:
+#     macos_network:
+#         driver: bridge
diff --git a/images/nodered_1.png b/images/nodered_1.png
diff --git a/images/nodered_2.png b/images/nodered_2.png
diff --git a/packages/frigate.yaml b/packages/frigate.yaml
@@ -158,7 +158,24 @@ automation:
               data:
                 attachments:
                   - /config/media/images/logo.jpg
+          - if: "{{ states('sensor.mail_usps_delivering') | int > 0 or states('sensor.mail_usps_mail') | int > 0}}"
+            then:
+              - service: notify.alexa_media
+                data:
+                  message: "<audio src='https://vps.secret/mail.mp3'/>"
+                  data:
+                    type: tts
+                  target: media_player.kitchen
           - delay: "00:02:00"
+          - service: camera.snapshot
+            data:
+              filename: /config/media/images/{{ '{{ entity_id.entity_id }}' }}/{{ now().strftime("%Y%m%d-%H%M%S") }}.jpg
+            target:
+              entity_id:
+                - camera.usps_vehicle
+          - service: shell_command.create_timelapse
+            data:
+              camera: usps_vehicle
 
       - if: "{{ 'PrimeAir' in  trigger.payload_json['after']['label'] }}"
         then: 

diff --git a/scripts.yaml b/scripts.yaml
@@ -123,9 +123,9 @@ master_bedroom_bedtime:
     # - service: script.turn_on # Calling this way allows the sequence to continue without blocking
     #   entity_id: script.christmas_goodnight
     - service: script.appdaemon_ac_night
-    - service: switch.turn_on
-      data:
-        entity_id: switch.master_bedroom_ceiling_fan
+    #- service: switch.turn_on
+    #  data:
+    #    entity_id: switch.master_bedroom_ceiling_fan
     #- service: switch.turn_on
     #  data:
     #    entity_id: switch.master_bedroom_sound_machine
@@ -310,4 +310,4 @@ desk_led_white:
       data:
         rgb_color: [255, 255, 255]
         brightness: 255
-        effect: "custom scan"
+        effect: "custom scan"