gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2025-12-22 07:10:47 -08:00
Code Issues Packages Projects Releases Wiki Activity

PROGMEM commands and remove mini lv_arduino

Browse Source
This commit is contained in:
Just Call Me Koko
2022-05-07 14:36:44 -04:00
parent d9a6966574
commit 0f58a0657b
4 changed files with 760 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
esp32_marauder/CommandLine.cpp
View File

@@ -24,7 +24,7 @@ void CommandLine::parseCommand(String input) {
if (input != "") if (input != "")
Serial.println("#" + input); Serial.println("#" + input);
if (input == "stopscan") { if (input == STOPSCAN_CMD) {
wifi_scan_obj.StartScan(WIFI_SCAN_OFF); wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
// If we don't do this, the text and button coordinates will be off // If we don't do this, the text and button coordinates will be off
@@ -34,13 +34,13 @@ void CommandLine::parseCommand(String input) {
menu_function_obj.changeMenu(menu_function_obj.current_menu); menu_function_obj.changeMenu(menu_function_obj.current_menu);
} }
else if (input == "scanap") { else if (input == SCANAP_CMD) {
display_obj.clearScreen(); display_obj.clearScreen();
menu_function_obj.drawStatusBar(); menu_function_obj.drawStatusBar();
wifi_scan_obj.StartScan(WIFI_SCAN_TARGET_AP, TFT_MAGENTA); wifi_scan_obj.StartScan(WIFI_SCAN_TARGET_AP, TFT_MAGENTA);
} }
else if (input == "clearap") { else if (input == CLEARAP_CMD) {
wifi_scan_obj.RunClearAPs(); wifi_scan_obj.RunClearAPs();
} }
} }

5
esp32_marauder/CommandLine.h
View File

@@ -9,6 +9,11 @@ extern MenuFunctions menu_function_obj;
extern WiFiScan wifi_scan_obj; extern WiFiScan wifi_scan_obj;
extern Display display_obj; extern Display display_obj;
// Commands
const char PROGMEM SCANAP_CMD[] = "scanap";
const char PROGMEM STOPSCAN_CMD[] = "stopscan";
const char PROGMEM CLEARAP_CMD[] = "clearap";
class CommandLine { class CommandLine {
private: private:
String getSerialInput(); String getSerialInput();

1476
esp32_marauder/MenuFunctions.cpp
View File

File diff suppressed because it is too large Load Diff

10
esp32_marauder/configs.h
View File

@@ -2,8 +2,8 @@
#define configs_h #define configs_h
// #define MARAUDER_MINI #define MARAUDER_MINI
#define MARAUDER_V4 // #define MARAUDER_V4
#define MARAUDER_VERSION "v0.9.6" #define MARAUDER_VERSION "v0.9.6"
@@ -138,6 +138,8 @@
//// MENU DEFINITIONS //// MENU DEFINITIONS
#ifdef MARAUDER_V4 #ifdef MARAUDER_V4
#define BANNER_TIME 100
#define COMMAND_PREFIX "!" #define COMMAND_PREFIX "!"
// Keypad start position, key sizes and spacing // Keypad start position, key sizes and spacing
@@ -155,13 +157,15 @@
#endif #endif
#ifdef MARAUDER_MINI #ifdef MARAUDER_MINI
#define BANNER_TIME 50
#define COMMAND_PREFIX "!" #define COMMAND_PREFIX "!"
// Keypad start position, key sizes and spacing // Keypad start position, key sizes and spacing
#define KEY_X (TFT_WIDTH/2) // Centre of key #define KEY_X (TFT_WIDTH/2) // Centre of key
#define KEY_Y (TFT_HEIGHT/4.5) #define KEY_Y (TFT_HEIGHT/4.5)
#define KEY_W TFT_WIDTH // Width and height #define KEY_W TFT_WIDTH // Width and height
#define KEY_H (TFT_HEIGHT/10) #define KEY_H (TFT_HEIGHT/12.8)
#define KEY_SPACING_X 0 // X and Y gap #define KEY_SPACING_X 0 // X and Y gap
#define KEY_SPACING_Y 1 #define KEY_SPACING_Y 1
#define KEY_TEXTSIZE 1 // Font size multiplier #define KEY_TEXTSIZE 1 // Font size multiplier