Fix mini update menu

This commit is contained in:
Just Call Me Koko
2022-08-02 14:03:43 -04:00
parent cebfc5b5c1
commit e8693c95f4
2 changed files with 8 additions and 5 deletions
+5 -2
View File
@@ -1019,7 +1019,8 @@ void MenuFunctions::main(uint32_t currentTime)
#ifdef MARAUDER_MINI
if (u_btn.justPressed()){
if (wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) {
if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) ||
(wifi_scan_obj.currentScanMode == OTA_UPDATE)) {
if (current_menu->selected > 0) {
current_menu->selected--;
this->buttonSelected(current_menu->selected);
@@ -1033,7 +1034,8 @@ void MenuFunctions::main(uint32_t currentTime)
}
}
if (d_btn.justPressed()){
if (wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) {
if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) ||
(wifi_scan_obj.currentScanMode == OTA_UPDATE)) {
if (current_menu->selected < current_menu->list->size() - 1) {
current_menu->selected++;
this->buttonSelected(current_menu->selected);
@@ -1810,6 +1812,7 @@ void MenuFunctions::RunSetup()
// Select update
whichUpdateMenu.parentMenu = &deviceMenu;
addNodes(&whichUpdateMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() {
wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
changeMenu(whichUpdateMenu.parentMenu);
});
addNodes(&whichUpdateMenu, text_table1[39], TFT_GREEN, NULL, WEB_UPDATE, [this]() {
+3 -3
View File
@@ -4,14 +4,14 @@
#define POLISH_POTATO
//#define MARAUDER_MINI
#define MARAUDER_MINI
//#define MARAUDER_V4
//#define MARAUDER_V6
//#define MARAUDER_KIT
//#define GENERIC_ESP32
#define MARAUDER_FLIPPER
//#define MARAUDER_FLIPPER
#define MARAUDER_VERSION "v0.9.12"
#define MARAUDER_VERSION "v0.9.13-rc1"
//// BUTTON DEFINITIONS
#ifdef MARAUDER_MINI