Fix of residual screen content following browser updates of SPIFFS files.
This commit is contained in:
parent
c1207e66ef
commit
a52143479f
5 changed files with 16 additions and 5 deletions
|
@ -1 +1 @@
|
|||
esptool.exe --chip esp32 --port COM14 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect 0xe000 boot_app0.bin 0x1000 bootloader_qio_80m.bin 0x10000 Afterburner.bin 0x8000 Afterburner.partitions.bin
|
||||
esptool.exe --chip esp32 --port COM14 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect 0xe000 boot_app0.bin 0x1000 bootloader_qio_80m.bin 0x10000 AfterburnerV3.0.0.bin 0x8000 Afterburner.partitions.bin
|
||||
|
|
|
@ -121,9 +121,9 @@
|
|||
|
||||
#define RX_DATA_TIMOUT 50
|
||||
|
||||
const int FirmwareRevision = 23;
|
||||
const int FirmwareSubRevision = 6;
|
||||
const char* FirmwareDate = "23 Jul 2019";
|
||||
const int FirmwareRevision = 30;
|
||||
const int FirmwareSubRevision = 0;
|
||||
const char* FirmwareDate = "28 Jul 2019";
|
||||
|
||||
|
||||
#ifdef ESP32
|
||||
|
|
|
@ -585,13 +585,23 @@ CScreenManager::showRebootMsg(const char* content[2], long delayTime)
|
|||
_dim(false);
|
||||
}
|
||||
|
||||
void
|
||||
CScreenManager::clearDisplay()
|
||||
{
|
||||
_pDisplay->clearDisplay();
|
||||
}
|
||||
|
||||
void
|
||||
CScreenManager::showOTAMessage(int percent, eOTAmodes updateType)
|
||||
{
|
||||
static int prevPercent = -1;
|
||||
|
||||
if(percent != prevPercent) {
|
||||
prevPercent = percent;
|
||||
_pDisplay->clearDisplay();
|
||||
if(percent < 0)
|
||||
return;
|
||||
|
||||
_pDisplay->setFontInfo(&arial_8ptBoldFontInfo);
|
||||
_pDisplay->setCursor(64, -1);
|
||||
_pDisplay->printCentreJustified("Firmware update");
|
||||
|
@ -611,7 +621,6 @@ CScreenManager::showOTAMessage(int percent, eOTAmodes updateType)
|
|||
_pDisplay->setCursor(64,42);
|
||||
_pDisplay->printCentreJustified(msg);
|
||||
}
|
||||
prevPercent = percent;
|
||||
_pDisplay->display();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -67,6 +67,7 @@ public:
|
|||
void selectMenu(eUIMenuSets menuset, int specific = -1); // use to select loop menus, including the root or branches
|
||||
void showRebootMsg(const char* content[2], long delayTime);
|
||||
void showOTAMessage(int percent, eOTAmodes updateType);
|
||||
void clearDisplay();
|
||||
void bumpTimeout();
|
||||
};
|
||||
|
||||
|
|
|
@ -702,6 +702,7 @@ void onUploadCompletion()
|
|||
server.send(500, "text/plain", "500: couldn't create file");
|
||||
}
|
||||
BrowserUpload.reset();
|
||||
ShowOTAScreen(-1, eOTAbrowser); // browser update
|
||||
}
|
||||
else {
|
||||
if(BrowserUpload.isOK()) {
|
||||
|
|
Loading…
Reference in a new issue