Skip to content
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.

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

Correct OTA process message show on display #137

Merged
merged 8 commits into from
Jun 4, 2024

Conversation

pnt325
Copy link
Collaborator

@pnt325 pnt325 commented May 17, 2024

No description provided.

if (ag->isOne()) {
oledDisplay.showNewFirmwareSkipped();
} else {
Serial.println("Firmware update: Skipped");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Propose to rephrase to
Firmware update skipped

if (ag->isOne()) {
oledDisplay.showNewFirmwareUpToDate();
} else {
Serial.println("Firmware update: up to date");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Propose to rephrase to
Firmware is up to date

@@ -529,6 +549,11 @@ static void displayExecuteOta(OtaState state, String msg, int processing) {
break;
}
case OtaState::OTA_STATE_SUCCESS: {
if (ag->isOne()) {
oledDisplay.showNewFirmwareUpdating(String(100));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not related to the PR but I would expect that we can write this here in this context

oledDisplay.showFirmwareUpdateProgress(100);

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's relate to PR. Because firmware process has finish 100% but display sometime do not show 100%.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ehm, I mean that we should pass the value along as an int (and not a String)

@@ -544,6 +569,7 @@ static void displayExecuteOta(OtaState state, String msg, int processing) {

delay(1000);
}
oledDisplay.setBrightness(0);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Curious to know, what happens without this line?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This like will be clear all display content while reboot device. If not the display still Show "Firmware update success" while rebooting

@@ -857,11 +883,12 @@ static void configUpdateHandle() {
fwNewVersion = configuration.newFirmwareVersion();
if (fwNewVersion.length()) {
bool doOta = false;
if (measurements.otaBootCount == 0) {
if (measurements.otaBootCount < 0) {
doOta = true;
Serial.println("First OTA");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the message is misleading, the device might have gone through several OTA updates when we arrive here.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's indicate first OTA check. If it's zero and process failed, retry will call for 3-4 times (Because we check cloud configure each 15sec). < 0 should help, that mean the otaBootCount is invalid, after first check it's set to bootCount

DISP()->firstPage();
do {
DISP()->setFont(u8g2_font_t0_16_tf);
setCentralText(20, "Firmware Update");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Propose to rephrase to
Firmware update skipped

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's fit for a line we should reduce the font size.

@@ -40,6 +40,8 @@ class OledDisplay : public PrintLog {
void showNewFirmwareUpdating(String percent);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

propose to rename to
showFormwareUpdateProgress(int percent)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok

@pnt325 pnt325 requested a review from nick-4711 May 20, 2024 09:17
DISP()->firstPage();
do {
DISP()->setFont(u8g2_font_t0_16_tf);
setCentralText(20, "Firmware Update");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The term Update is redundant this way, propose to make it a sentence and say

Firmware
is up to date

@@ -529,6 +549,11 @@ static void displayExecuteOta(OtaState state, String msg, int processing) {
break;
}
case OtaState::OTA_STATE_SUCCESS: {
if (ag->isOne()) {
oledDisplay.showNewFirmwareUpdating(String(100));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ehm, I mean that we should pass the value along as an int (and not a String)

@pnt325 pnt325 merged commit fde510b into develop Jun 4, 2024
16 checks passed
@pnt325 pnt325 deleted the hotfix/correct-ota-update-message-on-display branch June 4, 2024 11:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants