From b400486526ffda05af481537164bbf96a4498c41 Mon Sep 17 00:00:00 2001
From: "J.P. Krauss" <jkrauss@asymworks.com>
Date: Sun, 31 Jul 2022 14:57:44 -0700
Subject: [PATCH] Update Laundry Package

---
 packages/laundry/laundry.yaml | 71 ++++++++++++++++++++++++++++++-----
 1 file changed, 62 insertions(+), 9 deletions(-)

diff --git a/packages/laundry/laundry.yaml b/packages/laundry/laundry.yaml
index 4b4131d..445c634 100644
--- a/packages/laundry/laundry.yaml
+++ b/packages/laundry/laundry.yaml
@@ -1,5 +1,15 @@
 # Laundry Package
 
+# -----------------------------------------------------------------------------
+# Washer Final Pump-Out State Machine
+input_select:
+  washer_final_pump_state:
+    name: Washer Final Pump State
+    options:
+      - Idle
+      - Check
+      - Triggered
+
 # -----------------------------------------------------------------------------
 # Laundry Automations
 automation:
@@ -16,18 +26,61 @@ automation:
         data:
           message: Dryer is done
 
+  - alias: Washer Final Pump-Out - Check
+    mode: single
+    trigger:
+      - platform: state
+        entity_id: sensor.washer_power_electric_consumption_a
+        above: 0.5
+    conditions:
+      - condition: state
+        entity_id: input_select.washer_final_pump_state
+        state: Idle
+    action:
+      - service: input_select.select_option
+        target:
+          entity_id: input_select.washer_final_pump_state
+        data:
+          option: Check
+
+  - alias: Washer Final Pump-Out - Trigger
+    mode: single
+    trigger:
+      - platform: state
+        entity_id: sensor.washer_power_electric_consumption_a
+        below: 0.5
+    conditions:
+      - condition: state
+        entity_id: input_select.washer_final_pump_state
+        state: Check
+    action:
+      - service: input_select.select_option
+        target:
+          entity_id: input_select.washer_final_pump_state
+        data:
+          option: Triggered
+
+  - alias: Washer Final Pump-Out - Reset
+    mode: single
+    trigger:
+      - platform: state
+        entity_id: input_select.washer_final_pump_state
+        from: Idle
+        for:
+          seconds: 30
+    action:
+      - service: input_select.select_option
+        target:
+          entity_id: input_select.washer_final_pump_state
+        data:
+          option: Idle
+
   - alias: Notify when Washer Done
     mode: single
     trigger:
-      - platform: numeric_state
-        entity_id: sensor.washer_power_electric_consumption_a
-        below: 2.0
-        for:
-          # There is a ~ 5 minute delay within the rinse/spin cycle, so a 6
-          # minute threshold should avoid triggering early. The lid release
-          # occurs about 3 minutes after completion of the final spin, so
-          # there is only about 3 minutes of latency in this automation.
-          minutes: 6
+      - platform: state
+        entity_id: input_select.washer_final_pump_state
+        to: Triggered
     action:
       - service: notify.everyone
         data: