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

Remove a32u4 and 8266 components

Browse Source
This commit is contained in:
Just Call Me Koko
2023-07-19 16:57:57 -04:00
parent 3f5aecb38b
commit f30d8813f8
3 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
esp32_marauder/MenuFunctions.cpp
View File

@@ -113,7 +113,7 @@ MenuFunctions::MenuFunctions()
//lv_deinit(); //lv_deinit();
} }
void MenuFunctions::writeBadUSB(){ /*void MenuFunctions::writeBadUSB(){
// Create a keyboard and apply the styles // Create a keyboard and apply the styles
kb = lv_keyboard_create(lv_scr_act(), NULL); kb = lv_keyboard_create(lv_scr_act(), NULL);
lv_obj_set_size(kb, LV_HOR_RES, LV_VER_RES / 2); lv_obj_set_size(kb, LV_HOR_RES, LV_VER_RES / 2);
@@ -159,7 +159,7 @@ MenuFunctions::MenuFunctions()
// Focus it on one of the text areas to start // Focus it on one of the text areas to start
lv_keyboard_set_textarea(kb, ta1); lv_keyboard_set_textarea(kb, ta1);
lv_keyboard_set_cursor_manage(kb, true); lv_keyboard_set_cursor_manage(kb, true);
} }*/
// Event handler for settings drop down menus // Event handler for settings drop down menus
void setting_dropdown_cb(lv_obj_t * obj, lv_event_t event) { void setting_dropdown_cb(lv_obj_t * obj, lv_event_t event) {
@@ -729,7 +729,7 @@ MenuFunctions::MenuFunctions()
} }
} }
void write_bad_usb_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event) { /*void write_bad_usb_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event) {
extern Display display_obj; extern Display display_obj;
extern MenuFunctions menu_function_obj; extern MenuFunctions menu_function_obj;
extern A32u4Interface a32u4_obj; extern A32u4Interface a32u4_obj;
@@ -752,7 +752,7 @@ MenuFunctions::MenuFunctions()
wifi_scan_obj.StartScan(WIFI_SCAN_OFF); wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
display_obj.exit_draw = true; // set everything back to normal display_obj.exit_draw = true; // set everything back to normal
} }
} }*/
// Keyboard callback dedicated to joining wifi // Keyboard callback dedicated to joining wifi
void add_ssid_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event){ void add_ssid_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event){
@@ -1489,7 +1489,7 @@ void MenuFunctions::RunSetup()
// Main menu stuff // Main menu stuff
wifiMenu.list = new LinkedList<MenuNode>(); // Get list in second menu ready wifiMenu.list = new LinkedList<MenuNode>(); // Get list in second menu ready
bluetoothMenu.list = new LinkedList<MenuNode>(); // Get list in third menu ready bluetoothMenu.list = new LinkedList<MenuNode>(); // Get list in third menu ready
badusbMenu.list = new LinkedList<MenuNode>(); //badusbMenu.list = new LinkedList<MenuNode>();
generalMenu.list = new LinkedList<MenuNode>(); generalMenu.list = new LinkedList<MenuNode>();
deviceMenu.list = new LinkedList<MenuNode>(); deviceMenu.list = new LinkedList<MenuNode>();
@@ -1497,7 +1497,7 @@ void MenuFunctions::RunSetup()
failedUpdateMenu.list = new LinkedList<MenuNode>(); failedUpdateMenu.list = new LinkedList<MenuNode>();
whichUpdateMenu.list = new LinkedList<MenuNode>(); whichUpdateMenu.list = new LinkedList<MenuNode>();
confirmMenu.list = new LinkedList<MenuNode>(); confirmMenu.list = new LinkedList<MenuNode>();
espUpdateMenu.list = new LinkedList<MenuNode>(); //espUpdateMenu.list = new LinkedList<MenuNode>();
updateMenu.list = new LinkedList<MenuNode>(); updateMenu.list = new LinkedList<MenuNode>();
settingsMenu.list = new LinkedList<MenuNode>(); settingsMenu.list = new LinkedList<MenuNode>();
specSettingMenu.list = new LinkedList<MenuNode>(); specSettingMenu.list = new LinkedList<MenuNode>();
@@ -1524,13 +1524,13 @@ void MenuFunctions::RunSetup()
// Work menu names // Work menu names
mainMenu.name = text_table1[6]; mainMenu.name = text_table1[6];
wifiMenu.name = text_table1[7]; wifiMenu.name = text_table1[7];
badusbMenu.name = text_table1[8]; //badusbMenu.name = text_table1[8];
deviceMenu.name = text_table1[9]; deviceMenu.name = text_table1[9];
generalMenu.name = text_table1[10]; generalMenu.name = text_table1[10];
failedUpdateMenu.name = text_table1[11]; failedUpdateMenu.name = text_table1[11];
whichUpdateMenu.name = text_table1[12]; whichUpdateMenu.name = text_table1[12];
confirmMenu.name = text_table1[13]; confirmMenu.name = text_table1[13];
espUpdateMenu.name = text_table1[14]; //espUpdateMenu.name = text_table1[14];
updateMenu.name = text_table1[15]; updateMenu.name = text_table1[15];
languageMenu.name = text_table1[16]; languageMenu.name = text_table1[16];
infoMenu.name = text_table1[17]; infoMenu.name = text_table1[17];
@@ -1557,9 +1557,9 @@ void MenuFunctions::RunSetup()
addNodes(&mainMenu, text_table1[19], TFT_CYAN, NULL, BLUETOOTH, [this]() { addNodes(&mainMenu, text_table1[19], TFT_CYAN, NULL, BLUETOOTH, [this]() {
changeMenu(&bluetoothMenu); changeMenu(&bluetoothMenu);
}); });
if (a32u4_obj.supported) addNodes(&mainMenu, text_table1[8], TFT_RED, NULL, BAD_USB_ICO, [this]() { //if (a32u4_obj.supported) addNodes(&mainMenu, text_table1[8], TFT_RED, NULL, BAD_USB_ICO, [this]() {
changeMenu(&badusbMenu); // changeMenu(&badusbMenu);
}); //});
addNodes(&mainMenu, text_table1[10], TFT_MAGENTA, NULL, GENERAL_APPS, [this]() { addNodes(&mainMenu, text_table1[10], TFT_MAGENTA, NULL, GENERAL_APPS, [this]() {
changeMenu(&generalMenu); changeMenu(&generalMenu);
}); });
@@ -1881,21 +1881,21 @@ void MenuFunctions::RunSetup()
}); });
// Bad USB Menu // Bad USB Menu
badusbMenu.parentMenu = &mainMenu; //badusbMenu.parentMenu = &mainMenu;
addNodes(&badusbMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { //addNodes(&badusbMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() {
changeMenu(badusbMenu.parentMenu); // changeMenu(badusbMenu.parentMenu);
}); //});
addNodes(&badusbMenu, text_table1[36], TFT_PURPLE, NULL, TEST_BAD_USB_ICO, [this]() { //addNodes(&badusbMenu, text_table1[36], TFT_PURPLE, NULL, TEST_BAD_USB_ICO, [this]() {
a32u4_obj.test(); // a32u4_obj.test();
}); //});
#ifdef HAS_ILI9341 //#ifdef HAS_ILI9341
addNodes(&badusbMenu, text_table1[37], TFT_RED, NULL, BAD_USB_ICO, [this](){ // addNodes(&badusbMenu, text_table1[37], TFT_RED, NULL, BAD_USB_ICO, [this](){
display_obj.clearScreen(); // display_obj.clearScreen();
wifi_scan_obj.currentScanMode = LV_ADD_SSID; // wifi_scan_obj.currentScanMode = LV_ADD_SSID;
wifi_scan_obj.StartScan(LV_ADD_SSID, TFT_RED); // wifi_scan_obj.StartScan(LV_ADD_SSID, TFT_RED);
writeBadUSB(); // writeBadUSB();
}); // });
#endif //#endif
// General apps menu // General apps menu
generalMenu.parentMenu = &mainMenu; generalMenu.parentMenu = &mainMenu;
@@ -1979,19 +1979,19 @@ void MenuFunctions::RunSetup()
changeMenu(&confirmMenu); changeMenu(&confirmMenu);
}); });
#endif #endif
addNodes(&whichUpdateMenu, text_table1[41], TFT_RED, NULL, ESP_UPDATE_ICO, [this]() { //addNodes(&whichUpdateMenu, text_table1[41], TFT_RED, NULL, ESP_UPDATE_ICO, [this]() {
wifi_scan_obj.currentScanMode = ESP_UPDATE; // wifi_scan_obj.currentScanMode = ESP_UPDATE;
changeMenu(&espUpdateMenu); // changeMenu(&espUpdateMenu);
esp_obj.RunUpdate(); // esp_obj.RunUpdate();
}); //});
// ESP Update Menu // ESP Update Menu
espUpdateMenu.parentMenu = &whichUpdateMenu; //espUpdateMenu.parentMenu = &whichUpdateMenu;
addNodes(&espUpdateMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() { //addNodes(&espUpdateMenu, text09, TFT_LIGHTGREY, NULL, 0, [this]() {
wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF; // wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
esp_obj.bootRunMode(); // esp_obj.bootRunMode();
changeMenu(espUpdateMenu.parentMenu); // changeMenu(espUpdateMenu.parentMenu);
}); //});
// Confirm SD update menu // Confirm SD update menu
confirmMenu.parentMenu = &whichUpdateMenu; confirmMenu.parentMenu = &whichUpdateMenu;

8
esp32_marauder/MenuFunctions.h
View File

@@ -12,8 +12,8 @@
#include "BatteryInterface.h" #include "BatteryInterface.h"
#include "SDInterface.h" #include "SDInterface.h"
//#include "Web.h" //#include "Web.h"
#include "esp_interface.h" //#include "esp_interface.h"
#include "a32u4_interface.h" //#include "a32u4_interface.h"
#include "settings.h" #include "settings.h"
#ifdef HAS_BUTTONS #ifdef HAS_BUTTONS
@@ -30,8 +30,8 @@ extern WiFiScan wifi_scan_obj;
//extern Web web_obj; //extern Web web_obj;
extern SDInterface sd_obj; extern SDInterface sd_obj;
extern BatteryInterface battery_obj; extern BatteryInterface battery_obj;
extern EspInterface esp_obj; //extern EspInterface esp_obj;
extern A32u4Interface a32u4_obj; //extern A32u4Interface a32u4_obj;
extern Settings settings_obj; extern Settings settings_obj;
#define FLASH_BUTTON 0 #define FLASH_BUTTON 0

8
esp32_marauder/esp32_marauder.ino
View File

@@ -39,7 +39,7 @@ https://www.online-utility.org/image/convert/to/XBM
#include "LedInterface.h" #include "LedInterface.h"
#endif #endif
#include "esp_interface.h" //#include "esp_interface.h"
#include "settings.h" #include "settings.h"
#include "CommandLine.h" #include "CommandLine.h"
#include "lang_var.h" #include "lang_var.h"
@@ -55,7 +55,7 @@ https://www.online-utility.org/image/convert/to/XBM
#ifdef HAS_SCREEN #ifdef HAS_SCREEN
#include "Display.h" #include "Display.h"
#include "MenuFunctions.h" #include "MenuFunctions.h"
#include "a32u4_interface.h" //#include "a32u4_interface.h"
#endif #endif
#ifdef HAS_BUTTONS #ifdef HAS_BUTTONS
@@ -83,7 +83,7 @@ WiFiScan wifi_scan_obj;
EvilPortal evil_portal_obj; EvilPortal evil_portal_obj;
//Web web_obj; //Web web_obj;
Buffer buffer_obj; Buffer buffer_obj;
EspInterface esp_obj; //EspInterface esp_obj;
Settings settings_obj; Settings settings_obj;
CommandLine cli_obj; CommandLine cli_obj;
@@ -98,7 +98,7 @@ CommandLine cli_obj;
#ifdef HAS_SCREEN #ifdef HAS_SCREEN
Display display_obj; Display display_obj;
MenuFunctions menu_function_obj; MenuFunctions menu_function_obj;
A32u4Interface a32u4_obj; //A32u4Interface a32u4_obj;
#endif #endif
#ifdef HAS_SD #ifdef HAS_SD