Skip to content

fix(crow_alarm_panel): pace arm/disarm retries, match ARMED_STATE intent #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan-s-github merged 12 commits into from
Aug 23, 2026
Merged

fix(crow_alarm_panel): pace arm/disarm retries, match ARMED_STATE intent #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b3fb2f2
fix(crow_alarm_panel): pace arm/disarm retries, match ARMED_STATE intent
dan-s-github Aug 22, 2026
d4416e7
fix(crow_alarm_panel): silence -Wformat warning on backoff log
dan-s-github Aug 22, 2026
00a7d1f
fix(crow_alarm_panel): set CODE_ENTER_PENDING before terminal keypress
dan-s-github Aug 22, 2026
ad453ec
fix(crow_alarm_panel): drop arm/disarm keys committed before resolution
dan-s-github Aug 22, 2026
ff3e998
fix(crow_alarm_panel): gate CMD handling, watchdog on in-flight key
dan-s-github Aug 22, 2026
b9e78ff
fix(crow_alarm_panel): enforce keypress state-machine mutual exclusion
dan-s-github Aug 22, 2026
2f8d089
fix(crow_alarm_panel): gate optimistic publishes on request acceptance
dan-s-github Aug 22, 2026
be5ed60
fix(crow_alarm_panel): keep synchronously confirmed state over ARMING
dan-s-github Aug 22, 2026
372c3e9
fix(crow_alarm_panel): identify arm/disarm ops by generation token
dan-s-github Aug 22, 2026
94f1dbe
fix(crow_alarm_panel): drop stale timestamp write after digit keypress
dan-s-github Aug 22, 2026
374ab5b
fix(crow_alarm_panel): stop registration watchdog double-announce
dan-s-github Aug 23, 2026
4a0d7d9
docs(crow_alarm_panel): flag new unlabeled 0x91 packet (logs-34)
dan-s-github Aug 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions components/crow_alarm_panel/crow_alarm_control_panel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,16 @@ void CrowAlarmControlPanel::control(const alarm_control_panel::AlarmControlPanel
this->status_momentary_warning("Code required to arm", 2000);
return;
}
this->parent_->arm_away(code);
this->publish_state(alarm_control_panel::ACP_STATE_ARMING);
// Publish the optimistic transitional state only if the request was accepted (a
// rejected request starts no sequence and no watchdog, so nothing would ever move the
// entity out of ARMING again) AND this call's operation is still the active one. The
// call can yield waiting for the bus, during which the operation may resolve (matching
// ARMED_STATE publishes the confirmed state) and a different operation may even start
// re-entrantly; an unchanged generation rules out both (see arm_disarm_generation()).
const uint32_t gen = this->parent_->arm_disarm_generation();
if (this->parent_->arm_away(code) && this->parent_->arm_disarm_generation() == gen) {
this->publish_state(alarm_control_panel::ACP_STATE_ARMING);
}
break;
}
case alarm_control_panel::ACP_STATE_ARMED_HOME: {
Expand All @@ -37,8 +45,10 @@ void CrowAlarmControlPanel::control(const alarm_control_panel::AlarmControlPanel
this->status_momentary_warning("Code required to arm", 2000);
return;
}
this->parent_->arm_stay(code);
this->publish_state(alarm_control_panel::ACP_STATE_ARMING);
const uint32_t gen = this->parent_->arm_disarm_generation();
if (this->parent_->arm_stay(code) && this->parent_->arm_disarm_generation() == gen) {
this->publish_state(alarm_control_panel::ACP_STATE_ARMING);
}
break;
}
case alarm_control_panel::ACP_STATE_DISARMED: {
Expand All @@ -47,8 +57,10 @@ void CrowAlarmControlPanel::control(const alarm_control_panel::AlarmControlPanel
this->status_momentary_warning("Code required to disarm", 2000);
return;
}
this->parent_->disarm(code);
this->publish_state(alarm_control_panel::ACP_STATE_DISARMING);
const uint32_t gen = this->parent_->arm_disarm_generation();
if (this->parent_->disarm(code) && this->parent_->arm_disarm_generation() == gen) {
this->publish_state(alarm_control_panel::ACP_STATE_DISARMING);
}
break;
}
case alarm_control_panel::ACP_STATE_TRIGGERED:
Expand Down
Loading