Merge branch 'feat/ota-branch-switch' into merge/ota-branch-into-observer-firmware-dev
# Conflicts: # examples/simple_repeater/MyMesh.cpp
This commit is contained in:
commit
ebd562e2c8
8 files changed
+162
-8
No files matched your search
@@ -1821,7 +1821,7 @@ void MyMesh::loop() {
|
||||
setBridgeState(true);
|
||||
otaAlert(bridge->isRunning() ? "OTA aborted: MQTT stop unclean, bridge resumed"
|
||||
: "OTA aborted: MQTT stop unproven, bridge resumes when it completes");
|
||||
} else if (!_cli.getBoard()->otaFromManifest(ota_resolve_base(_prefs.ota_channel), getFirmwareVer(), false, ota_reply)) {
|
||||
} else if (!_cli.getBoard()->otaFromManifest(ota_resolve_base(_ota_update_channel), getFirmwareVer(), false, ota_reply)) {
|
||||
Serial.print("OTA: aborted, resuming bridge - "); Serial.println(ota_reply);
|
||||
char ota_alert_msg[160];
|
||||
snprintf(ota_alert_msg, sizeof(ota_alert_msg), "OTA aborted: %s", ota_reply);
|
||||
|
||||
Reference in new issue
Block a user