diff --git a/automations.yaml b/automations.yaml index e469bcd7..af12e8f2 100644 --- a/automations.yaml +++ b/automations.yaml @@ -4426,11 +4426,11 @@ '', ''_'')) ~ ''_color'') | replace(''#'', '''') | lower }}' - variables: spool_id: '{% 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'' %}{% set b = e[:-10] %}{% if (states(b) | float(0)) - > 0 and ns.id == '''' %}{% set ns.id = states(b ~ ''_id'') %}{% endif %}{% - endif %}{% endfor %}{{ ns.id }}' + %}{% if e.endswith(''_color_hex'') and (state_attr(e[:-10], ''location'') | + default('''', true) | lower) == (''cfs lite '' ~ old_slot.split(''_'')[-1]) + %}{% set b = e[:-10] %}{% if (states(b) | float(0)) > 0 and ns.id == '''' + %}{% set ns.id = states(b ~ ''_id'') %}{% endif %}{% endif %}{% endfor %}{{ + ns.id }}' - variables: helper_idx: '{{ old_slot.split(''_'')[-1] if old_slot.split(''_'')[-1] in [''1'', ''2'', ''3'', ''4''] else '''' }}' diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json index 3fdbd258..5952c539 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.5, + "voltage": 120, "countdown_to_turn_on": 0, "ac_frequency": 60, "power_factor": 0.14, @@ -22,15 +22,15 @@ }, "0xffffb40e0607af27": { "state": "ON", - "voltage": 118.8, + "voltage": 119.3, "ac_frequency": 60, "led_brightness": 100, "countdown_to_turn_off": 0, "countdown_to_turn_on": 0, - "power": 3.9, - "current": 0.11, + "power": 2, + "current": 0.09, "energy": 57.08, - "power_factor": 0.3, + "power_factor": 0.17, "update": { "state": "idle", "installed_version": 268513381, @@ -45,10 +45,10 @@ "state": "ON", "led_brightness": 100, "countdown_to_turn_off": 0, - "voltage": 119.3, + "voltage": 119.2, "countdown_to_turn_on": 0, "energy": 109.5, - "power_factor": 0.2, + "power_factor": 0.17, "ac_frequency": 60, "update": { "state": "idle", @@ -74,13 +74,13 @@ "led_brightness": 100, "countdown_to_turn_off": 0, "countdown_to_turn_on": 0, - "voltage": 118.4, + "voltage": 118.8, "state": "ON", "ac_frequency": 60, "energy": 222.51, "power": 3.6, "current": 0.05, - "power_factor": 0.95, + "power_factor": 0.34, "update": { "state": "idle", "installed_version": 268513381, @@ -95,13 +95,13 @@ "led_brightness": 100, "countdown_to_turn_off": 0, "countdown_to_turn_on": 0, - "voltage": 119.3, + "voltage": 119.2, "energy": 104.12, "state": "ON", - "power": 67, - "current": 0.67, + "power": 56.2, + "current": 0.7, "ac_frequency": 60, - "power_factor": 0.77, + "power_factor": 0.8, "update": { "state": "idle", "installed_version": 268513381, @@ -114,7 +114,7 @@ }, "0xffffb40e060895b3": { "state": "ON", - "voltage": 118.8, + "voltage": 119.3, "ac_frequency": 60, "energy": 15.31, "current": 0.01,