various tidyups
This commit is contained in:
zorruno
@@ -3,6 +3,11 @@
|
||||
################################################################################
|
||||
#
|
||||
# Version:
|
||||
# - 1.2 - 2026-08-16
|
||||
# - Removed the spare-button trigger after false presses caused unintended
|
||||
# power toggles.
|
||||
# - Retains occupancy-based backup control for Office power supplies.
|
||||
#
|
||||
# - 1.1 - 2026-07-25
|
||||
# - Stripped light control (now handled by direct MQTT)
|
||||
# - Retains power supply backup control only
|
||||
@@ -20,16 +25,9 @@
|
||||
# - Turns Office power supplies off after the Office mmWave occupancy sensor
|
||||
# has been clear for the configured delay period.
|
||||
#
|
||||
# - Provides a backup manual control path using the Office spare button.
|
||||
# This is useful if the occupancy sensor is offline.
|
||||
#
|
||||
# Notes:
|
||||
# - This is treated as a BACKUP automation for POWER SUPPLIES ONLY.
|
||||
# - Light control is handled by direct ESPHome/MQTT (see device YAMLs).
|
||||
# - The physical spare button is read using:
|
||||
# binary_sensor.esp_officelights_button_3_spare
|
||||
# - The spare relay is used as the manual master/latch state:
|
||||
# switch.esp_officelights_relay_3_spare
|
||||
#
|
||||
################################################################################
|
||||
|
||||
@@ -58,9 +56,8 @@ automation:
|
||||
description: >
|
||||
Backup automation for Office power supplies. Turns power on when Office
|
||||
mmWave occupancy or movement is detected. Turns power off after the
|
||||
occupancy sensor is clear for the configured delay period. Also allows
|
||||
manual backup toggling using the Office spare button and spare relay.
|
||||
Light control is handled by direct ESPHome/MQTT sync.
|
||||
occupancy sensor is clear for the configured delay period. Light control
|
||||
is handled by direct ESPHome/MQTT sync.
|
||||
mode: restart
|
||||
triggers:
|
||||
##########################################################################
|
||||
@@ -79,19 +76,6 @@ automation:
|
||||
to: "off"
|
||||
id: occupancy_clear
|
||||
|
||||
##########################################################################
|
||||
# Manual backup button press.
|
||||
#
|
||||
# The spare relay state is used as the master/latch:
|
||||
# - If spare relay is OFF when the button is pressed, turn power ON.
|
||||
# - If spare relay is ON when the button is pressed, turn power OFF.
|
||||
##########################################################################
|
||||
- trigger: state
|
||||
entity_id: binary_sensor.esp_officelights_button_3_spare
|
||||
from: "off"
|
||||
to: "on"
|
||||
id: backup_button_pressed
|
||||
|
||||
##########################################################################
|
||||
# Startup check.
|
||||
#
|
||||
@@ -214,102 +198,3 @@ automation:
|
||||
- action: switch.turn_off
|
||||
target:
|
||||
entity_id: switch.esp_officelights_relay_3_spare
|
||||
|
||||
######################################################################
|
||||
# MANUAL BACKUP LOGIC:
|
||||
# Button pressed while spare relay master is ON - turn power off.
|
||||
######################################################################
|
||||
- alias: "Backup button pressed - spare relay on, turn power off"
|
||||
conditions:
|
||||
- condition: trigger
|
||||
id: backup_button_pressed
|
||||
- condition: state
|
||||
entity_id: switch.esp_officelights_relay_3_spare
|
||||
state: "on"
|
||||
sequence:
|
||||
##############################################################
|
||||
# Power off.
|
||||
##############################################################
|
||||
- alias: "Turn off Office right hand GPO if needed"
|
||||
if:
|
||||
- condition: state
|
||||
entity_id: switch.esp_officedeskrightgpo_office_right_hand_gpo
|
||||
state: "on"
|
||||
then:
|
||||
- action: switch.turn_off
|
||||
target:
|
||||
entity_id: switch.esp_officedeskrightgpo_office_right_hand_gpo
|
||||
|
||||
- alias: "Turn off Office ELV power supply if needed"
|
||||
if:
|
||||
- condition: state
|
||||
entity_id: switch.esp_officeelvcontrol_office_elv_power_supply
|
||||
state: "on"
|
||||
then:
|
||||
- action: switch.turn_off
|
||||
target:
|
||||
entity_id: switch.esp_officeelvcontrol_office_elv_power_supply
|
||||
|
||||
##############################################################
|
||||
# Manual master/latch relay off last.
|
||||
##############################################################
|
||||
- alias: "Turn off Office spare relay master if needed"
|
||||
if:
|
||||
- condition: state
|
||||
entity_id: switch.esp_officelights_relay_3_spare
|
||||
state: "on"
|
||||
then:
|
||||
- action: switch.turn_off
|
||||
target:
|
||||
entity_id: switch.esp_officelights_relay_3_spare
|
||||
|
||||
######################################################################
|
||||
# MANUAL BACKUP LOGIC:
|
||||
# Button pressed while spare relay master is OFF - turn power on.
|
||||
#
|
||||
# No off timer is started from this manual press. If the occupancy
|
||||
# sensor later changes to clear, the normal clear-delay logic will run.
|
||||
######################################################################
|
||||
- alias: "Backup button pressed - spare relay off, turn power on"
|
||||
conditions:
|
||||
- condition: trigger
|
||||
id: backup_button_pressed
|
||||
- condition: state
|
||||
entity_id: switch.esp_officelights_relay_3_spare
|
||||
state: "off"
|
||||
sequence:
|
||||
##############################################################
|
||||
# Power supplies.
|
||||
##############################################################
|
||||
- alias: "Turn on Office ELV power supply if needed"
|
||||
if:
|
||||
- condition: state
|
||||
entity_id: switch.esp_officeelvcontrol_office_elv_power_supply
|
||||
state: "off"
|
||||
then:
|
||||
- action: switch.turn_on
|
||||
target:
|
||||
entity_id: switch.esp_officeelvcontrol_office_elv_power_supply
|
||||
|
||||
- alias: "Turn on Office right hand GPO if needed"
|
||||
if:
|
||||
- condition: state
|
||||
entity_id: switch.esp_officedeskrightgpo_office_right_hand_gpo
|
||||
state: "off"
|
||||
then:
|
||||
- action: switch.turn_on
|
||||
target:
|
||||
entity_id: switch.esp_officedeskrightgpo_office_right_hand_gpo
|
||||
|
||||
##############################################################
|
||||
# Manual master/latch relay.
|
||||
##############################################################
|
||||
- alias: "Turn on Office spare relay master if needed"
|
||||
if:
|
||||
- condition: state
|
||||
entity_id: switch.esp_officelights_relay_3_spare
|
||||
state: "off"
|
||||
then:
|
||||
- action: switch.turn_on
|
||||
target:
|
||||
entity_id: switch.esp_officelights_relay_3_spare
|
||||
|
||||
Reference in New Issue
Block a user