sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 07:03:55 +00:00
Code Issues Releases Wiki Activity

Fix BYPASS_AUTO feature to work with or without an arming delay (#9051)

Browse Source
This commit is contained in:
Nate Clark
2025-06-13 14:31:00 -04:00
committed by GitHub
parent 02469c2d4c
commit 666a3ee5e9
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
esphome/components/template/alarm_control_panel/template_alarm_control_panel.cpp
View File

@@ -110,15 +110,7 @@ void TemplateAlarmControlPanel::loop() {
delay = this->arming_night_time_; delay = this->arming_night_time_;
} }
if ((millis() - this->last_update_) > delay) { if ((millis() - this->last_update_) > delay) {
#ifdef USE_BINARY_SENSOR this->bypass_before_arming();
for (auto sensor_info : this->sensor_map_) {
// Check for sensors left on and set to bypass automatically and remove them from monitoring
if ((sensor_info.second.flags & BINARY_SENSOR_MODE_BYPASS_AUTO) && (sensor_info.first->state)) {
ESP_LOGW(TAG, "%s is left on and will be automatically bypassed", sensor_info.first->get_name().c_str());
this->bypassed_sensor_indicies_.push_back(sensor_info.second.store_index);
}
}
#endif
this->publish_state(this->desired_state_); this->publish_state(this->desired_state_);
} }
return; return;
@@ -259,10 +251,23 @@ void TemplateAlarmControlPanel::arm_(optional<std::string> code, alarm_control_p
if (delay > 0) { if (delay > 0) {
this->publish_state(ACP_STATE_ARMING); this->publish_state(ACP_STATE_ARMING);
} else { } else {
this->bypass_before_arming();
this->publish_state(state); this->publish_state(state);
} }
} }
void TemplateAlarmControlPanel::bypass_before_arming() {
#ifdef USE_BINARY_SENSOR
for (auto sensor_info : this->sensor_map_) {
// Check for sensors left on and set to bypass automatically and remove them from monitoring
if ((sensor_info.second.flags & BINARY_SENSOR_MODE_BYPASS_AUTO) && (sensor_info.first->state)) {
ESP_LOGW(TAG, "'%s' is left on and will be automatically bypassed", sensor_info.first->get_name().c_str());
this->bypassed_sensor_indicies_.push_back(sensor_info.second.store_index);
}
}
#endif
}
void TemplateAlarmControlPanel::control(const AlarmControlPanelCall &call) { void TemplateAlarmControlPanel::control(const AlarmControlPanelCall &call) {
if (call.get_state()) { if (call.get_state()) {
if (call.get_state() == ACP_STATE_ARMED_AWAY) { if (call.get_state() == ACP_STATE_ARMED_AWAY) {

1
esphome/components/template/alarm_control_panel/template_alarm_control_panel.h
View File

@@ -60,6 +60,7 @@ class TemplateAlarmControlPanel : public alarm_control_panel::AlarmControlPanel,
bool get_requires_code_to_arm() const override { return this->requires_code_to_arm_; } bool get_requires_code_to_arm() const override { return this->requires_code_to_arm_; }
bool get_all_sensors_ready() { return this->sensors_ready_; }; bool get_all_sensors_ready() { return this->sensors_ready_; };
void set_restore_mode(TemplateAlarmControlPanelRestoreMode restore_mode) { this->restore_mode_ = restore_mode; } void set_restore_mode(TemplateAlarmControlPanelRestoreMode restore_mode) { this->restore_mode_ = restore_mode; }
void bypass_before_arming();
#ifdef USE_BINARY_SENSOR #ifdef USE_BINARY_SENSOR
/** Add a binary_sensor to the alarm_panel. /** Add a binary_sensor to the alarm_panel.