Just Call Me Koko 3 лет назад
Родитель
Сommit
e8693c95f4
2 измененных файлов с 8 добавлено и 5 удалено
  1. 5 2
      esp32_marauder/MenuFunctions.cpp
  2. 3 3
      esp32_marauder/configs.h

+ 5 - 2
esp32_marauder/MenuFunctions.cpp

@@ -1019,7 +1019,8 @@ void MenuFunctions::main(uint32_t currentTime)
 
 
   #ifdef MARAUDER_MINI
   #ifdef MARAUDER_MINI
     if (u_btn.justPressed()){
     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) {
         if (current_menu->selected > 0) {
           current_menu->selected--;
           current_menu->selected--;
           this->buttonSelected(current_menu->selected);
           this->buttonSelected(current_menu->selected);
@@ -1033,7 +1034,8 @@ void MenuFunctions::main(uint32_t currentTime)
       }
       }
     }
     }
     if (d_btn.justPressed()){
     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) {
         if (current_menu->selected < current_menu->list->size() - 1) {
           current_menu->selected++;
           current_menu->selected++;
           this->buttonSelected(current_menu->selected);
           this->buttonSelected(current_menu->selected);
@@ -1810,6 +1812,7 @@ void MenuFunctions::RunSetup()
   // Select update
   // Select update
   whichUpdateMenu.parentMenu = &deviceMenu;
   whichUpdateMenu.parentMenu = &deviceMenu;
   addNodes(&whichUpdateMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() {
   addNodes(&whichUpdateMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() {
+    wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
     changeMenu(whichUpdateMenu.parentMenu);
     changeMenu(whichUpdateMenu.parentMenu);
   });
   });
   addNodes(&whichUpdateMenu, text_table1[39], TFT_GREEN, NULL, WEB_UPDATE, [this]() {
   addNodes(&whichUpdateMenu, text_table1[39], TFT_GREEN, NULL, WEB_UPDATE, [this]() {

+ 3 - 3
esp32_marauder/configs.h

@@ -4,14 +4,14 @@
 
 
   #define POLISH_POTATO
   #define POLISH_POTATO
   
   
-  //#define MARAUDER_MINI
+  #define MARAUDER_MINI
   //#define MARAUDER_V4
   //#define MARAUDER_V4
   //#define MARAUDER_V6
   //#define MARAUDER_V6
   //#define MARAUDER_KIT
   //#define MARAUDER_KIT
   //#define GENERIC_ESP32
   //#define GENERIC_ESP32
-  #define MARAUDER_FLIPPER
+  //#define MARAUDER_FLIPPER
 
 
-  #define MARAUDER_VERSION "v0.9.12"
+  #define MARAUDER_VERSION "v0.9.13-rc1"
 
 
   //// BUTTON DEFINITIONS
   //// BUTTON DEFINITIONS
   #ifdef MARAUDER_MINI
   #ifdef MARAUDER_MINI