diff --git a/Bootload/COM.bat b/Bootload/COM.bat index f0cf1cf..9dfbfd6 100644 --- a/Bootload/COM.bat +++ b/Bootload/COM.bat @@ -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 diff --git a/src/Afterburner.cpp b/src/Afterburner.cpp index 53e9852..5ca7650 100644 --- a/src/Afterburner.cpp +++ b/src/Afterburner.cpp @@ -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 diff --git a/src/OLED/ScreenManager.cpp b/src/OLED/ScreenManager.cpp index b7fe972..4480317 100644 --- a/src/OLED/ScreenManager.cpp +++ b/src/OLED/ScreenManager.cpp @@ -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(); } } diff --git a/src/OLED/ScreenManager.h b/src/OLED/ScreenManager.h index 2bda03c..984d209 100644 --- a/src/OLED/ScreenManager.h +++ b/src/OLED/ScreenManager.h @@ -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(); }; diff --git a/src/WiFi/BTCWebServer.cpp b/src/WiFi/BTCWebServer.cpp index b709e29..42d7a86 100644 --- a/src/WiFi/BTCWebServer.cpp +++ b/src/WiFi/BTCWebServer.cpp @@ -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()) {