From 6323cfeb0cdd4be414f1810584eb291c942b795b Mon Sep 17 00:00:00 2001 From: Home Assistant Version Control Date: Thu, 15 Oct 2026 13:12:41 +0000 Subject: [PATCH] automations.yaml, zigbee2mqtt/state.json --- automations.yaml | 8 ++++---- zigbee2mqtt/state.json | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/automations.yaml b/automations.yaml index e4fe6296..99afc96d 100644 --- a/automations.yaml +++ b/automations.yaml @@ -4827,9 +4827,9 @@ {% endfor %} {% set pct = ((((sp.rem | float) / (sp.fw | float)) * 100) | round(0) | int) if (sp.fw | float) > 0 else 0 %} {% if sp.id != '' %}{% set ns.loaded = ns.loaded + [label ~ ': ' ~ (sp.rem | round(1)) ~ ' g (' ~ pct ~ '%)'] %}{% endif %} - {% if sp.id != '' and single and c == gcol %}{% set ns.match_label = label %}{% set ns.match_rem = sp.rem %}{% endif %} + {% if sp.id != '' and single and n == aslot %}{% set ns.match_label = label %}{% set ns.match_rem = sp.rem %}{% endif %} {% if sp.id != '' %} - {% if single and c == gcol %} + {% if single and n == aslot %} {% if (sp.rem | float) < (job_g | float) %}{% set ns.short = ns.short + [label ~ ': ' ~ (sp.rem | round(1)) ~ ' g (' ~ pct ~ '%) left, ' ~ job_g ~ ' g needed'] %} {% else %}{% set ns.ok = ns.ok + [label ~ ': ' ~ (sp.rem | round(1)) ~ ' g (' ~ pct ~ '%) left, ' ~ job_g ~ ' g needed'] %}{% endif %} {% elif single %} @@ -4850,11 +4850,11 @@ {% if job_g <= 0 %}Cannot verify: slicer filament estimate not available yet.{% if ns.loaded %} Loaded: - {{ ns.loaded | join('\n- ') }}{% endif %} - {% elif single and gcol in cols.list %} + {% elif single and aslot != '' %} {% if ns.short %}NOT ENOUGH filament: - {{ ns.short | join('\n- ') }} {% elif ns.match_label %}Enough filament: {{ ns.match_label }}: {{ ns.match_rem | round(1) }} g left, {{ job_g }} g needed. - {% else %}Matched slot {{ gcol | upper }} has no Spoolman spool at CFS Lite, so remaining cannot be checked.{% endif %} + {% else %}Active slot {{ aslot }} has no Spoolman spool at CFS Lite, so remaining cannot be checked.{% endif %} {% elif single %}No exact colour match for the print colour #{{ gcol | upper }} in a loaded CFS slot, so the exact spool cannot be identified.{% if ns.cover %} Would cover {{ job_g }} g: - {{ ns.cover | join('\n- ') }}{% endif %}{% if ns.below %} diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json index 6edaff9e..f93de7da 100644 --- a/zigbee2mqtt/state.json +++ b/zigbee2mqtt/state.json @@ -4,7 +4,7 @@ "state": "ON", "led_brightness": 100, "countdown_to_turn_off": 0, - "voltage": 119.9, + "voltage": 119.3, "countdown_to_turn_on": 0, "ac_frequency": 60, "power_factor": 0.14, @@ -74,12 +74,12 @@ "led_brightness": 100, "countdown_to_turn_off": 0, "countdown_to_turn_on": 0, - "voltage": 118.3, + "voltage": 118.8, "state": "ON", "ac_frequency": 60, - "energy": 222.53, - "power": 98.8, - "current": 0.91, + "energy": 222.54, + "power": 3.6, + "current": 0.05, "power_factor": 0.41, "update": { "state": "idle", @@ -96,10 +96,10 @@ "countdown_to_turn_off": 0, "countdown_to_turn_on": 0, "voltage": 119.2, - "energy": 104.14, + "energy": 104.15, "state": "ON", - "power": 107.7, - "current": 1.12, + "power": 69.1, + "current": 0.73, "ac_frequency": 60, "power_factor": 0.8, "update": { @@ -114,12 +114,12 @@ }, "0xffffb40e060895b3": { "state": "ON", - "voltage": 119.8, + "voltage": 119.3, "ac_frequency": 60, "energy": 15.31, "current": 0.01, "power": 0.1, - "power_factor": 0.13, + "power_factor": 0.11, "linkquality": 116, "update": { "state": "idle", @@ -143,7 +143,7 @@ "current": 0.02, "ac_frequency": 60, "power": 0.3, - "power_factor": 0.2, + "power_factor": 0.14, "update": { "state": "idle", "installed_version": 268513381,