From 7adf7e4e20f0286d6d3fad59923c7f72c5a3a50c Mon Sep 17 00:00:00 2001
From: Tony Stork <tm24fan8@gmail.com>
Date: Tue, 2 May 2023 17:32:27 -0400
Subject: [PATCH] Better way of dealing with rain alerts

---
 packages/custom_weather.yaml | 13 -------------
 packages/weatheralerts.yaml  | 13 ++++++++-----
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/packages/custom_weather.yaml b/packages/custom_weather.yaml
index fa19cf4..5e220ed 100644
--- a/packages/custom_weather.yaml
+++ b/packages/custom_weather.yaml
@@ -93,19 +93,6 @@ template:
       device_class: safety
       attributes:
         current_strikes: "{{ states('sensor.blitzortung_lightning_counter') | int }}"
-    - name: Precipitation
-      unique_id: 2423f8c6-f9ce-4063-a7f8-30dc260d1376
-      state: "{{ states('weather.iron_nerd_weather_station') in ['rainy','thunderstorm','lightning','sleet','snow','snowy','hail','tornado'] }}"
-      attributes:
-        type_of_precipitation: >
-          {% if states('weather.iron_nerd_weather_station') in ['rainy','thunderstorm','lightning','hail','tornado'] %}
-            Rain
-          {% elif states('weather.iron_nerd_weather_station') in ['sleet','snow','snowy'] %}
-            Snow
-          {% else %}
-            N/A
-          {% endif %}
-      icon: mdi:water
 
 sensor:
   - platform: weatheralerts
diff --git a/packages/weatheralerts.yaml b/packages/weatheralerts.yaml
index 426e086..5dd33dd 100644
--- a/packages/weatheralerts.yaml
+++ b/packages/weatheralerts.yaml
@@ -1545,8 +1545,11 @@ automation:
     alias: Rain Window Warning
     trigger:
       - platform: state
-        entity_id: binary_sensor.precipitation
-        to: 'on'
+        entity_id: sensor.pirateweather_precip
+        from: 'none'
+        not_to:
+          - unavailable
+          - unknown
     condition:
       - condition: state
         entity_id: binary_sensor.windows
@@ -1563,13 +1566,13 @@ automation:
         data:
           who: everywhere
           message: "It is raining and there are windows open in the house. Please close them!"
-      - wait_template: "{{ is_state('binary_sensor.windows','off') or is_state('binary_sensor.precipitation','off') }}"
+      - wait_template: "{{ is_state('binary_sensor.windows','off') or is_state('sensor.pirateweather_precip','none') }}"
         timeout: "00:15:00"
         continue_on_timeout: true
       - choose:
         - conditions:
           - condition: template
-            value_template: "{{ is_state('binary_sensor.windows','off') and is_state('binary_sensor.precipitation','on') }}"
+            value_template: "{{ is_state('binary_sensor.windows','off') and states('sensor.pirateweather_precip') not in ['none'] }}"
           sequence:
           - service: script.text_notify
             data:
@@ -1583,7 +1586,7 @@ automation:
               message: "Windows are now closed. Thank you, and enjoy your dry house."
         - conditions:
           - condition: template
-            value_template: "{{ is_state('binary_sensor.precipitation','off') }}"
+            value_template: "{{ is_state('sensor.pirateweather_precip','none') }}"
           sequence:
           - service: script.text_notify
             data: