From e94b3714bdac3ebe6ac3ba8858c1345555ddbc7d Mon Sep 17 00:00:00 2001
From: Home Assistant Version Control <havc@local>
Date: Thu, 15 Oct 2026 12:54:04 +0000
Subject: [PATCH] scripts.yaml, zigbee2mqtt/state.json

---
 scripts.yaml           |  8 +++-----
 zigbee2mqtt/state.json | 30 +++++++++++++++---------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/scripts.yaml b/scripts.yaml
index 713f119d..015aa868 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -262,11 +262,9 @@ spoolman_set_spool_remaining:
   sequence:
   - variables:
       resolved_id: '{% set n = (slot | int(0)) if slot is defined else 0 %}{% if n
-        >= 1 %}{% set color = states(''sensor.sparkx_i7_cfs_box_1_slot_'' ~ (n | int)
-        ~ ''_color'') | replace(''#'', '''') | lower %}{% set ns = namespace(id='''')
-        %}{% for e in integration_entities(''spoolman'') %}{% if e.endswith(''_color_hex'')
-        and (states(e) | replace(''#'', '''') | lower) == color and (state_attr(e[:-10],
-        ''location'') | default('''', true) | lower) == ''cfs lite'' and ns.id ==
+        >= 1 %}{% set ns = namespace(id='''') %}{% for e in integration_entities(''spoolman'')
+        %}{% if e.endswith(''_color_hex'') and (state_attr(e[:-10], ''location'') |
+        default('''', true) | lower) == (''cfs lite '' ~ (n | int)) and ns.id ==
         '''' %}{% set ns.id = states(e[:-10] ~ ''_id'') %}{% endif %}{% endfor %}{{
         ns.id }}{% else %}{{ (spool_id | int(0)) if spool_id is defined else 0 }}{%
         endif %}'
diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json
index 5952c539..9e47477f 100644
--- a/zigbee2mqtt/state.json
+++ b/zigbee2mqtt/state.json
@@ -4,7 +4,7 @@
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 120,
+        "voltage": 119.8,
         "countdown_to_turn_on": 0,
         "ac_frequency": 60,
         "power_factor": 0.14,
@@ -27,8 +27,8 @@
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
-        "power": 2,
-        "current": 0.09,
+        "power": 2.3,
+        "current": 0.1,
         "energy": 57.08,
         "power_factor": 0.17,
         "update": {
@@ -45,10 +45,10 @@
         "state": "ON",
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 119.2,
+        "voltage": 119.1,
         "countdown_to_turn_on": 0,
-        "energy": 109.5,
-        "power_factor": 0.17,
+        "energy": 109.51,
+        "power_factor": 0.91,
         "ac_frequency": 60,
         "update": {
             "state": "idle",
@@ -58,8 +58,8 @@
             "latest_release_notes": null
         },
         "linkquality": 145,
-        "power": 0.2,
-        "current": 0.01,
+        "power": 85.1,
+        "current": 0.8,
         "power_on_behavior": "on"
     },
     "0xb40e060fffe031e3": {
@@ -96,10 +96,10 @@
         "countdown_to_turn_off": 0,
         "countdown_to_turn_on": 0,
         "voltage": 119.2,
-        "energy": 104.12,
+        "energy": 104.13,
         "state": "ON",
-        "power": 56.2,
-        "current": 0.7,
+        "power": 60.8,
+        "current": 0.61,
         "ac_frequency": 60,
         "power_factor": 0.8,
         "update": {
@@ -114,12 +114,12 @@
     },
     "0xffffb40e060895b3": {
         "state": "ON",
-        "voltage": 119.3,
+        "voltage": 119.8,
         "ac_frequency": 60,
         "energy": 15.31,
         "current": 0.01,
         "power": 0.1,
-        "power_factor": 0.11,
+        "power_factor": 0.22,
         "linkquality": 116,
         "update": {
             "state": "idle",
@@ -136,14 +136,14 @@
     "0xffffb40e0608864e": {
         "led_brightness": 100,
         "countdown_to_turn_off": 0,
-        "voltage": 119.8,
+        "voltage": 120.3,
         "energy": 37.39,
         "countdown_to_turn_on": 0,
         "state": "ON",
         "current": 0.02,
         "ac_frequency": 60,
         "power": 0.3,
-        "power_factor": 0.14,
+        "power_factor": 0.2,
         "update": {
             "state": "idle",
             "installed_version": 268513381,