Skip to content

Fix OTA controller update status after firmware update (#749) #753

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

Open
EyJunge1 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix OTA controller update status after firmware update (#749) #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e4875c
Fix OTA controller update status after firmware update
EyJunge1 Jun 10, 2026
8c25002
Address CodeRabbit review feedback for OTA status fix
EyJunge1 Jun 10, 2026
b02e438
Merge branch 'jniebuhr:master' into fix/749-ota-controller-status
EyJunge1 Jun 13, 2026
506c84b
Merge branch 'jniebuhr:master' into fix/749-ota-controller-status
EyJunge1 Jun 18, 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
16 changes: 10 additions & 6 deletions src/display/plugins/WebUIPlugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ void WebUIPlugin::loop() {
ota->checkForUpdates();
pluginManager->trigger("ota:update:status", "value", ota->isUpdateAvailable());
lastUpdateCheck = now;
updateOTAStatus(ota->getCurrentVersion());
updateOTAStatus();
}
if (now > lastStatus + STATUS_PERIOD && !ws.getClients().empty()) {
lastStatus = now;
Expand Down Expand Up @@ -495,7 +495,7 @@ void WebUIPlugin::handleOTASettings(uint32_t clientId, JsonDocument &request) {
lastUpdateCheck = 0;
}
}
updateOTAStatus("Checking...");
updateOTAStatus();
}

void WebUIPlugin::handleOTAStart(uint32_t clientId, JsonDocument &request) {
Expand Down Expand Up @@ -886,20 +886,24 @@ void WebUIPlugin::handleBLEScaleInfo(AsyncWebServerRequest *request) {
request->send(response);
}

void WebUIPlugin::updateOTAStatus(const String &version) {
void WebUIPlugin::updateOTAStatus() {
if (ws.getClients().empty()) {
return;
}
Settings const &settings = controller->getSettings();
const String controllerVersion = controller->getSystemInfo().version;
if (controllerVersion != lastSyncedControllerVersion) {
ota->setControllerVersion(controllerVersion);
lastSyncedControllerVersion = controllerVersion;
}
JsonDocument doc(&psramAllocator);
doc["latestVersion"] = ota->getCurrentVersion();
doc["tp"] = "res:ota-settings";
doc["latestVersion"] = ota->getCurrentVersion();
doc["displayUpdateAvailable"] = ota->isUpdateAvailable(false);
doc["controllerUpdateAvailable"] = ota->isUpdateAvailable(true);
doc["displayVersion"] = BUILD_GIT_VERSION;
doc["controllerVersion"] = controller->getSystemInfo().version;
doc["controllerVersion"] = controllerVersion;
doc["hardware"] = controller->getSystemInfo().hardware;
doc["latestVersion"] = ota->getCurrentVersion();
doc["channel"] = settings.getOTAChannel();
doc["updating"] = updating;
// LittleFS usage metrics
Expand Down
3 changes: 2 additions & 1 deletion src/display/plugins/WebUIPlugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class WebUIPlugin : public Plugin {
void handleBLEScaleScan(AsyncWebServerRequest *request);
void handleBLEScaleConnect(AsyncWebServerRequest *request);
void handleBLEScaleInfo(AsyncWebServerRequest *request);
void updateOTAStatus(const String &version);
void updateOTAStatus();
void updateOTAProgress(uint8_t phase, int progress);
void sendAutotuneResult();
void sendAutotuneFailed();
Expand Down Expand Up @@ -83,6 +83,7 @@ class WebUIPlugin : public Plugin {
bool apMode = false;
bool serverRunning = false;
String updateComponent = "";
String lastSyncedControllerVersion = "";
float currentBluetoothWeight = 0.0f;
// Reused for every 500ms status broadcast. Allocating a fresh JsonDocument
// each tick was a major contributor to internal-heap fragmentation
Expand Down
Loading