From e8693c95f4fade0b09ec847aa9769c8447a77282 Mon Sep 17 00:00:00 2001 From: Just Call Me Koko Date: Tue, 2 Aug 2022 14:03:43 -0400 Subject: [PATCH] Fix mini update menu --- esp32_marauder/MenuFunctions.cpp | 7 +++++-- esp32_marauder/configs.h | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp index e74e138..4bc0f1c 100644 --- a/esp32_marauder/MenuFunctions.cpp +++ b/esp32_marauder/MenuFunctions.cpp @@ -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]() { diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 993e343..4b97e27 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -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