From 4192ecbaae71f1b470affee427d4bb865dc31243 Mon Sep 17 00:00:00 2001
From: Home Assistant Version Control <havc@local>
Date: Thu, 1 Oct 2026 05:25:33 +0000
Subject: [PATCH] automations.yaml, zigbee2mqtt/state.json

---
 automations.yaml       | 42 ++++++++++++++++++++++++------------------
 zigbee2mqtt/state.json | 16 ++++++++--------
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/automations.yaml b/automations.yaml
index 5bc1bb34..a3d99adc 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -4213,10 +4213,11 @@
   mode: restart
 - id: sparkx_i7_cfs_auto_recover
   alias: SparkX i7 - CFS Info Auto Recover
-  description: The ha_creality_ws integration drops its CFS sensors to unavailable
+  description: 'The ha_creality_ws integration drops its CFS sensors to unavailable
     whenever the integration is reloaded, and they only come back when the printer
-    is asked. This re-requests CFS info after a sustained outage, with a settle delay
-    and a re-check so a brief reload gap does not cause a spurious request.
+    is asked. A state trigger only fires on the transition, so this retries the recovery
+    rather than relying on a single attempt: up to 3 tries spaced 2 minutes apart,
+    then it gives up and writes a logbook entry instead of retrying forever.'
   triggers:
   - entity_id: sensor.sparkx_i7_cfs_box_1_temperature
     id: cfs_unavailable
@@ -4240,24 +4241,29 @@
       sequence:
       - delay:
           seconds: 60
+  - repeat:
+      count: 3
+      sequence:
+      - else: []
+        if:
+        - condition: template
+          value_template: '{{ is_state(''sensor.sparkx_i7_cfs_box_1_temperature'',
+            ''unavailable'') }}'
+        then:
+        - action: ha_creality_ws.request_cfs_info
+          target:
+            device_id: 1196bfc60ac925f3874be27098978ef6
+        - delay:
+            seconds: 30
   - if:
     - condition: template
       value_template: '{{ is_state(''sensor.sparkx_i7_cfs_box_1_temperature'', ''unavailable'')
         }}'
     then:
-    - action: ha_creality_ws.request_cfs_info
-      target:
-        device_id: 1196bfc60ac925f3874be27098978ef6
-    - delay:
-        seconds: 30
-    - if:
-      - condition: template
-        value_template: '{{ is_state(''sensor.sparkx_i7_cfs_box_1_temperature'', ''unavailable'')
-          }}'
-      then:
-      - action: logbook.log
-        data:
-          entity_id: sensor.sparkx_i7_cfs_box_1_temperature
-          message: CFS info still unavailable 30s after request_cfs_info
-          name: SparkX i7 CFS
+    - action: logbook.log
+      data:
+        entity_id: sensor.sparkx_i7_cfs_box_1_temperature
+        message: CFS info still unavailable after 3 recovery attempts; giving up until
+          the next state change
+        name: SparkX i7 CFS
   mode: single
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index fca34d63..ff469227 100644
--- a/zigbee2mqtt/state.json
+++ b/zigbee2mqtt/state.json
@@ -27,8 +27,8 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "power": 2.3,
-        "current": 0.09,
+        "power": 1.9,
+        "current": 0.1,
         "energy": 50.77,
         "power_factor": 0.19,
         "update": {
@@ -48,7 +48,7 @@
         "voltage": 120.5,
         "countdown_to_turn_on": 0,
         "energy": 96.05,
-        "power_factor": 0.3,
+        "power_factor": 0.89,
         "ac_frequency": 60,
         "update": {
             "state": "idle",
@@ -58,8 +58,8 @@
             "latest_release_notes": null
         },
         "linkquality": 145,
-        "power": 5.7,
-        "current": 0.19,
+        "power": 86.4,
+        "current": 0.82,
         "power_on_behavior": "on"
     },
     "0xb40e060fffe031e3": {
@@ -77,8 +77,8 @@
         "voltage": 119.3,
         "state": "ON",
         "ac_frequency": 60,
-        "energy": 198.19,
-        "power": 104.1,
+        "energy": 198.2,
+        "power": 105,
         "current": 0.92,
         "power_factor": 0.95,
         "update": {
@@ -98,7 +98,7 @@
         "voltage": 121,
         "energy": 95.94,
         "state": "ON",
-        "power": 17.4,
+        "power": 15.3,
         "current": 0.26,
         "ac_frequency": 60,
         "power_factor": 0.56,