automations.yaml, zigbee2mqtt/state.json

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 %}