From 7e37ef933e1f3428e41635b48ecf140a72e2b36b Mon Sep 17 00:00:00 2001 From: Just Call Me Koko Date: Wed, 9 Nov 2022 12:39:36 -0500 Subject: [PATCH] Fix crash with too many APs on menu --- esp32_marauder/MenuFunctions.cpp | 7 ++++++- esp32_marauder/configs.h | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp index d176f0f..e5542b2 100644 --- a/esp32_marauder/MenuFunctions.cpp +++ b/esp32_marauder/MenuFunctions.cpp @@ -1674,7 +1674,12 @@ void MenuFunctions::RunSetup() addNodes(&wifiAPMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { changeMenu(wifiAPMenu.parentMenu); }); - for (int i = 0; i < access_points->size(); i++) { + int menu_limit; + if (access_points->size() <= BUTTON_ARRAY_LEN) + menu_limit = access_points->size(); + else + menu_limit = BUTTON_ARRAY_LEN; + for (int i = 0; i < menu_limit - 1; i++) { addNodes(&wifiAPMenu, access_points->get(i).essid, TFT_CYAN, NULL, KEYBOARD_ICO, [this, i](){ AccessPoint new_ap = access_points->get(i); new_ap.selected = !access_points->get(i).selected; diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 5a65305..8589037 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -5,13 +5,13 @@ #define POLISH_POTATO //#define MARAUDER_MINI - #define MARAUDER_V4 + //#define MARAUDER_V4 //#define MARAUDER_V6 //#define MARAUDER_KIT //#define GENERIC_ESP32 - //#define MARAUDER_FLIPPER + #define MARAUDER_FLIPPER - #define MARAUDER_VERSION "v0.9.17" + #define MARAUDER_VERSION "v0.9.18" //// BUTTON DEFINITIONS #ifdef MARAUDER_MINI