diff --git a/automations.yaml b/automations.yaml index cee22b1c..e22670ca 100644 --- a/automations.yaml +++ b/automations.yaml @@ -3821,53 +3821,80 @@ mode: single - id: '1787723854939' alias: 3D Printer Lights - Sync Boolean - description: Synchronizes input_boolean.3d_printer_lights when either printer light - changes manually, keeping the SparkX and local lights aligned. + description: Keeps the SparkX and local printer lights aligned when either light + is manually turned on or off. Brightness and color-only updates are ignored. triggers: - - entity_id: - - light.sparkx_i7_light - - light.3d_printer_lights_local - id: light_changed + - entity_id: light.sparkx_i7_light + from: 'off' + id: sparkx_on + to: 'on' + trigger: state + - entity_id: light.sparkx_i7_light + from: 'on' + id: sparkx_off + to: 'off' + trigger: state + - entity_id: light.3d_printer_lights_local + from: 'off' + id: local_on + to: 'on' + trigger: state + - entity_id: light.3d_printer_lights_local + from: 'on' + id: local_off + to: 'off' trigger: state - event: start id: ha_start trigger: homeassistant - conditions: - - condition: template - value_template: "{{ is_state('input_boolean.3d_printer_lights', 'on') !=\n (is_state('light.sparkx_i7_light', - 'on') or\n is_state('light.3d_printer_lights_local', 'on')) }}" actions: - - if: - - condition: trigger - id: ha_start - then: - - delay: - seconds: 15 - - else: - - action: light.turn_off - target: - entity_id: light.sparkx_i7_light - - action: light.turn_off - continue_on_error: true - target: - entity_id: light.3d_printer_lights_local - if: - - condition: or - conditions: - - condition: state - entity_id: light.sparkx_i7_light - state: 'on' - - condition: state - entity_id: light.3d_printer_lights_local - state: 'on' - then: - - action: light.turn_on - target: - entity_id: light.sparkx_i7_light - - action: light.turn_on - continue_on_error: true - target: - entity_id: light.3d_printer_lights_local + - choose: + - conditions: + - condition: trigger + id: + - sparkx_on + - local_on + sequence: + - action: light.turn_on + continue_on_error: true + target: + entity_id: + - light.sparkx_i7_light + - light.3d_printer_lights_local + - conditions: + - condition: trigger + id: + - sparkx_off + - local_off + sequence: + - action: light.turn_off + continue_on_error: true + target: + entity_id: + - light.sparkx_i7_light + - light.3d_printer_lights_local + - conditions: + - condition: trigger + id: ha_start + sequence: + - delay: + seconds: 15 + - if: + - condition: or + conditions: + - condition: state + entity_id: light.sparkx_i7_light + state: 'on' + - condition: state + entity_id: light.3d_printer_lights_local + state: 'on' + then: + - action: light.turn_on + continue_on_error: true + target: + entity_id: + - light.sparkx_i7_light + - light.3d_printer_lights_local mode: single - id: '1787790202454' alias: Z2M Error Monitor diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json index c8986e4c..556e04b1 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.8, + "voltage": 119.3, "countdown_to_turn_on": 0, "ac_frequency": 60, "power_factor": 0.11, @@ -27,7 +27,7 @@ "led_brightness": 100, "countdown_to_turn_off": 0, "countdown_to_turn_on": 0, - "power": 2.5, + "power": 2.3, "current": 0.1, "energy": 46.98, "power_factor": 0.18, @@ -45,10 +45,10 @@ "state": "ON", "led_brightness": 100, "countdown_to_turn_off": 0, - "voltage": 119.3, + "voltage": 118.8, "countdown_to_turn_on": 0, - "energy": 91.31, - "power_factor": 0.9, + "energy": 91.33, + "power_factor": 0.99, "ac_frequency": 60, "update": { "state": "idle", @@ -58,8 +58,8 @@ "latest_release_notes": null }, "linkquality": 120, - "power": 83.9, - "current": 0.89, + "power": 195.9, + "current": 1.66, "power_on_behavior": "on" }, "0xb40e060fffe031e3": { @@ -74,11 +74,11 @@ "led_brightness": 100, "countdown_to_turn_off": 0, "countdown_to_turn_on": 0, - "voltage": 118.3, + "voltage": 117.8, "state": "ON", "ac_frequency": 60, - "energy": 187, - "power": 101.3, + "energy": 187.01, + "power": 96.6, "current": 0.95, "power_factor": 0.34, "update": { @@ -95,13 +95,13 @@ "led_brightness": 100, "countdown_to_turn_off": 0, "countdown_to_turn_on": 0, - "voltage": 118.5, - "energy": 92.88, + "voltage": 119.1, + "energy": 92.89, "state": "ON", - "power": 57.7, - "current": 0.61, + "power": 57.6, + "current": 0.59, "ac_frequency": 60, - "power_factor": 0.79, + "power_factor": 0.8, "update": { "state": "idle", "installed_version": 268513381,