Parcourir la source

Release v0.9.8

Just Call Me Koko il y a 3 ans
Parent
commit
809f0fb19d

+ 6 - 6
esp32_marauder/CommandLine.cpp

@@ -145,9 +145,9 @@ void CommandLine::runCommand(String input) {
   if (cmd_args.get(0) == STOPSCAN_CMD) {
     if (wifi_scan_obj.currentScanMode == OTA_UPDATE) {
       wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
-      #ifdef HAS_SCREEN
-        menu_function_obj.changeMenu(updateMenu.parentMenu);
-      #endif
+      //#ifdef HAS_SCREEN
+      //  menu_function_obj.changeMenu(menu_function_obj.updateMenu.parentMenu);
+      //#endif
       WiFi.softAPdisconnect(true);
       web_obj.shutdownServer();
       return;
@@ -369,9 +369,9 @@ void CommandLine::runCommand(String input) {
       if (w_sw != -1) {
         Serial.println("Starting Marauder OTA Update. Stop with " + (String)STOPSCAN_CMD);
         wifi_scan_obj.currentScanMode = OTA_UPDATE;
-        #ifdef HAS_SCREEN
-          menu_function_obj.changeMenu(menu_function_obj.updateMenu);
-        #endif
+        //#ifdef HAS_SCREEN
+        //  menu_function_obj.changeMenu(menu_function_obj.updateMenu);
+        //#endif
         web_obj.setupOTAupdate();
       }
       // Update via SD

+ 0 - 0
esp32_marauder/esp32_marauder_v0_9_7_20220528_2_flipper.bin → esp32_marauder/PreviousVersions/esp32_marauder_v0_9_7_20220528_2_flipper.bin


+ 0 - 0
esp32_marauder/esp32_marauder_v0_9_7_20220528_2_kit.bin → esp32_marauder/PreviousVersions/esp32_marauder_v0_9_7_20220528_2_kit.bin


+ 0 - 0
esp32_marauder/esp32_marauder_v0_9_7_20220528_2_mini.bin → esp32_marauder/PreviousVersions/esp32_marauder_v0_9_7_20220528_2_mini.bin


+ 0 - 0
esp32_marauder/esp32_marauder_v0_9_7_20220528_2_new_hardware.bin → esp32_marauder/PreviousVersions/esp32_marauder_v0_9_7_20220528_2_new_hardware.bin


+ 0 - 0
esp32_marauder/esp32_marauder_v0_9_7_20220528_2_old_hardware.bin → esp32_marauder/PreviousVersions/esp32_marauder_v0_9_7_20220528_2_old_hardware.bin


+ 2 - 2
esp32_marauder/configs.h

@@ -7,9 +7,9 @@
   //#define MARAUDER_MINI
   //#define MARAUDER_V4
   //#define MARAUDER_V6
-  //#define MARAUDER_KIT
+  #define MARAUDER_KIT
   //#define GENERIC_ESP32
-  #define MARAUDER_FLIPPER
+  //#define MARAUDER_FLIPPER
 
   #define MARAUDER_VERSION "v0.9.8"
 

BIN
esp32_marauder/esp32_marauder_v0_9_8_20220606_flipper.bin


BIN
esp32_marauder/esp32_marauder_v0_9_8_20220606_kit.bin


BIN
esp32_marauder/esp32_marauder_v0_9_8_20220606_mini.bin


BIN
esp32_marauder/esp32_marauder_v0_9_8_20220606_new_hardware.bin


BIN
esp32_marauder/esp32_marauder_v0_9_8_20220606_old_hardware.bin