From 27d03005521874334b8ec95da9fbdd033079d7d4 Mon Sep 17 00:00:00 2001 From: Home Assistant Version Control Date: Wed, 14 Oct 2026 17:37:12 +0000 Subject: [PATCH] automations.yaml, zigbee2mqtt/state.json --- automations.yaml | 19 ++++++++++++------- zigbee2mqtt/state.json | 14 +++++++------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/automations.yaml b/automations.yaml index f73df99f..9c7ef140 100644 --- a/automations.yaml +++ b/automations.yaml @@ -4852,16 +4852,21 @@ {% 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 %} {% 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('; ') }}{% endif %}{% if ns.below %} - Below {{ job_g }} g: {{ ns.below | join('; ') }}{% endif %}{% if not ns.cover and not ns.below %} + Would cover {{ job_g }} g: + - {{ ns.cover | join('\n- ') }}{% endif %}{% if ns.below %} + Below {{ job_g }} g: + - {{ ns.below | join('\n- ') }}{% endif %}{% if not ns.cover and not ns.below %} No loaded CFS slot has a matching Spoolman spool to compare.{% endif %} {% elif ns.short %}NOT ENOUGH filament - possible shortfall: - {{ ns.short | join('\n') }}{% if ns.ok %} - OK (would still cover the whole job): {{ ns.ok | join('; ') }}{% endif %}{% if ns.missing %} - No Spoolman spool matched for: {{ ns.missing | join(', ') }}{% endif %} + - {{ ns.short | join('\n- ') }}{% if ns.ok %} + OK (would still cover the whole job): + - {{ ns.ok | join('\n- ') }}{% endif %}{% if ns.missing %} + No Spoolman spool matched for: + - {{ ns.missing | join('\n- ') }}{% endif %} {% elif ns.ok %}Enough filament: - {{ ns.ok | join('\n') }}{% if ns.missing %} - No Spoolman spool matched for: {{ ns.missing | join(', ') }}{% endif %} + - {{ ns.ok | join('\n- ') }}{% if ns.missing %} + No Spoolman spool matched for: + - {{ ns.missing | join('\n- ') }}{% endif %} {% elif ns.missing %}Could not match any loaded CFS slot to a Spoolman spool.{% endif %} - action: notify.persistent_notification data: diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json index b768a5d6..efdbd895 100644 --- a/zigbee2mqtt/state.json +++ b/zigbee2mqtt/state.json @@ -1,13 +1,13 @@ { "0xffffb40e0607ace4": { - "energy": 24.25, + "energy": 24.26, "state": "ON", "led_brightness": 100, "countdown_to_turn_off": 0, "voltage": 119.5, "countdown_to_turn_on": 0, "ac_frequency": 60, - "power_factor": 0.11, + "power_factor": 0.14, "update": { "state": "idle", "installed_version": 268513381, @@ -27,7 +27,7 @@ "led_brightness": 100, "countdown_to_turn_off": 0, "countdown_to_turn_on": 0, - "power": 2, + "power": 1.9, "current": 0.09, "energy": 56.31, "power_factor": 0.18, @@ -78,8 +78,8 @@ "state": "ON", "ac_frequency": 60, "energy": 221.05, - "power": 107.5, - "current": 1, + "power": 101, + "current": 0.89, "power_factor": 0.94, "update": { "state": "idle", @@ -96,9 +96,9 @@ "countdown_to_turn_off": 0, "countdown_to_turn_on": 0, "voltage": 119.1, - "energy": 103.61, + "energy": 103.62, "state": "ON", - "power": 29.6, + "power": 31.3, "current": 0.44, "ac_frequency": 60, "power_factor": 0.57,