Skip to content

fix: defer HA-triggered OTA execOTA() out of MQTT callback to main loop #687

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
BrentIO merged 2 commits into from
Jun 21, 2026
Merged

fix: defer HA-triggered OTA execOTA() out of MQTT callback to main loop #687

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8edf4c9
fix: defer HA-triggered OTA execOTA() out of MQTT callback to main loop
BrentIO Jun 21, 2026
9448ba8
refactor: collapse _otaNonForcedPendingRequest into _otaPendingRequest
BrentIO Jun 21, 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
17 changes: 12 additions & 5 deletions Controller/Controller.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3695,8 +3695,9 @@ void setup_OtaFirmware(){


/**
* Executes a pending forced OTA update using execOTA(JsonDocument&), matching
* the HW-Reg implementation exactly. onComplete handles the reboot on success.
* Executes a pending OTA update. If _otaPendingDoc is empty the update was
* triggered from HA via MQTT (non-forced); otherwise it is a forced update
* with a specific document from the HTTP API.
*/
void otaFirmware_checkPending(){

Expand All @@ -3705,6 +3706,14 @@ void otaFirmware_checkPending(){
}

_otaUpdateInProcess = true;
_otaCurrentPartition[0] = '\0';

if(_otaPendingDoc.size() == 0){
_otaPendingRequest = false;
otaFirmware.execOTA();
_otaUpdateInProcess = false;
return;
}

otaFirmware.setApplicationName(_otaPendingDoc["application_name"]);

Expand All @@ -3720,8 +3729,6 @@ void otaFirmware_checkPending(){
}
}

_otaCurrentPartition[0] = '\0';

otaFirmware.onProgress([](const char* partition, size_t written, size_t total){
_otaUpdateInProcess = true;
if(strcmp(partition, _otaCurrentPartition) != 0){
Expand Down Expand Up @@ -4375,7 +4382,7 @@ void eventHandler_mqttMessageReceived(char* topic, byte* pl, unsigned int length
mqttClient.publish(topic, buffer);

if(!_otaManifestUrl.isEmpty()){
otaFirmware.execOTA();
_otaPendingRequest = true;
}
return;
}
Expand Down
Loading