airgradienthq/arduino
1
0
Fork 1
mirror of https://github.com/airgradienthq/arduino.git synced 2025-07-14 16:36:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

rename function

Browse Source
This commit is contained in:
Phat Nguyen
2024-05-17 20:17:49 +07:00
parent c04ab90fd2
commit 6e54409512
3 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
examples/OneOpenAir/OneOpenAir.ino
View File

@ -502,7 +502,7 @@ static void displayExecuteOta(OtaState state, String msg, int processing) {
switch (state) {
case OtaState::OTA_STATE_BEGIN: {
if (ag->isOne()) {
oledDisplay.showNewFirmwareVersion(msg);
oledDisplay.showFirmwareUpdateVersion(msg);
} else {
Serial.println("New firmware: " + msg);
}
@ -511,7 +511,7 @@ static void displayExecuteOta(OtaState state, String msg, int processing) {
}
case OtaState::OTA_STATE_FAIL: {
if (ag->isOne()) {
oledDisplay.showNewFirmwareFailed();
oledDisplay.showFirmwareUpdateFailed();
} else {
Serial.println("Error: Firmware update: failed");
}
@ -521,7 +521,7 @@ static void displayExecuteOta(OtaState state, String msg, int processing) {
}
case OtaState::OTA_STATE_SKIP: {
if (ag->isOne()) {
oledDisplay.showNewFirmwareSkipped();
oledDisplay.showFirmwareUpdateSkipped();
} else {
Serial.println("Firmware update: Skipped");
}
@ -531,7 +531,7 @@ static void displayExecuteOta(OtaState state, String msg, int processing) {
}
case OtaState::OTA_STATE_UP_TO_DATE: {
if (ag->isOne()) {
oledDisplay.showNewFirmwareUpToDate();
oledDisplay.showFirmwareUpdateUpToDate();
} else {
Serial.println("Firmware update: up to date");
}
@ -541,7 +541,7 @@ static void displayExecuteOta(OtaState state, String msg, int processing) {
}
case OtaState::OTA_STATE_PROCESSING: {
if (ag->isOne()) {
oledDisplay.showNewFirmwareUpdating(String(processing));
oledDisplay.showFirmwareUpdateProgress(processing);
} else {
Serial.println("Firmware update: " + String(processing) + String("%"));
}
@ -549,11 +549,6 @@ static void displayExecuteOta(OtaState state, String msg, int processing) {
break;
}
case OtaState::OTA_STATE_SUCCESS: {
if (ag->isOne()) {
oledDisplay.showNewFirmwareUpdating(String(100));
delay(250);
}
int i = 6;
while(i != 0) {
i = i - 1;
@ -562,7 +557,7 @@ static void displayExecuteOta(OtaState state, String msg, int processing) {
while (i != 0) {
i = i - 1;
if (ag->isOne()) {
oledDisplay.showNewFirmwareSuccess(String(i));
oledDisplay.showFirmwareUpdateSuccess(String(i));
} else {
Serial.println("Rebooting... " + String(i));
}

14
src/AgOledDisplay.cpp
View File

@ -330,7 +330,7 @@ void OledDisplay::setBrightness(int percent) {
}
}
void OledDisplay::showNewFirmwareVersion(String version) {
void OledDisplay::showFirmwareUpdateVersion(String version) {
if (isDisplayOff) {
return;
}
@ -344,7 +344,7 @@ void OledDisplay::showNewFirmwareVersion(String version) {
} while (DISP()->nextPage());
}
void OledDisplay::showNewFirmwareUpdating(String percent) {
void OledDisplay::showFirmwareUpdateProgress(int percent) {
if (isDisplayOff) {
return;
}
@ -353,11 +353,11 @@ void OledDisplay::showNewFirmwareUpdating(String percent) {
do {
DISP()->setFont(u8g2_font_t0_16_tf);
setCentralText(20, "Firmware Update");
setCentralText(50, String("Updating... ") + percent + String("%"));
setCentralText(50, String("Updating... ") + String(percent) + String("%"));
} while (DISP()->nextPage());
}
void OledDisplay::showNewFirmwareSuccess(String count) {
void OledDisplay::showFirmwareUpdateSuccess(String count) {
if (isDisplayOff) {
return;
}
@ -371,7 +371,7 @@ void OledDisplay::showNewFirmwareSuccess(String count) {
} while (DISP()->nextPage());
}
void OledDisplay::showNewFirmwareFailed(void) {
void OledDisplay::showFirmwareUpdateFailed(void) {
if (isDisplayOff) {
return;
}
@ -385,7 +385,7 @@ void OledDisplay::showNewFirmwareFailed(void) {
} while (DISP()->nextPage());
}
void OledDisplay::showNewFirmwareSkipped(void) {
void OledDisplay::showFirmwareUpdateSkipped(void) {
if (isDisplayOff) {
return;
}
@ -398,7 +398,7 @@ void OledDisplay::showNewFirmwareSkipped(void) {
} while (DISP()->nextPage());
}
void OledDisplay::showNewFirmwareUpToDate(void) {
void OledDisplay::showFirmwareUpdateUpToDate(void) {
if (isDisplayOff) {
return;
}

12
src/AgOledDisplay.h
View File

@ -36,12 +36,12 @@ public:
void showDashboard(void);
void showDashboard(const char *status);
void setBrightness(int percent);
void showNewFirmwareVersion(String version);
void showNewFirmwareUpdating(String percent);
void showNewFirmwareSuccess(String count);
void showNewFirmwareFailed(void);
void showNewFirmwareSkipped(void);
void showNewFirmwareUpToDate(void);
void showFirmwareUpdateVersion(String version);
void showFirmwareUpdateProgress(int percent);
void showFirmwareUpdateSuccess(String count);
void showFirmwareUpdateFailed(void);
void showFirmwareUpdateSkipped(void);
void showFirmwareUpdateUpToDate(void);
};
#endif /** _AG_OLED_DISPLAY_H_ */