gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2026-03-12 21:22:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix for non display hardware

Browse Source
This commit is contained in:
Just Call Me Koko
2026-03-03 13:37:00 -05:00
parent f46c6d857d
commit 5f848cb76e
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
esp32_marauder/WiFiScan.cpp
View File

@@ -3283,11 +3283,13 @@ void WiFiScan::setWiFiMode(wifi_mode_t mode, wifi_promiscuous_cb_t cb) {
}
void WiFiScan::prepareScanStage(uint16_t color_1, uint16_t color_2) {
#ifdef HAS_ILI9341
#ifdef HAS_SCREEN
#ifdef HAS_ILI9341
display_obj.touchToExit();
#endif
display_obj.tft.setTextColor(color_1, color_2);
//display_obj.setupScrollArea(display_obj.TOP_FIXED_AREA_2, BOT_FIXED_AREA);
#endif
}
void WiFiScan::RunPingScan(uint8_t scan_mode, uint16_t color) {
@@ -5893,16 +5895,6 @@ void WiFiScan::apSnifferCallbackFull(void* buf, wifi_promiscuous_pkt_type_t type
//new_ap.wps = true;
new_ap.man = man;
access_points->set(index, new_ap);
#ifdef HAS_SCREEN
display_string = RED_KEY;
int temp_len = display_string.length();
for (int i = 0; i < 50 - temp_len; i++)
display_string.concat(" ");
display_obj.display_buffer->add(display_string);
#endif
}
//}
}
@@ -5964,6 +5956,10 @@ void WiFiScan::apSnifferCallbackFull(void* buf, wifi_promiscuous_pkt_type_t type
}
Serial.print(F(" "));
#ifdef HAS_SCREEN
display_obj.display_buffer->add(display_string);
#endif
if (essid == "") {
essid = bssid;
@@ -6152,6 +6148,8 @@ void WiFiScan::apSnifferCallbackFull(void* buf, wifi_promiscuous_pkt_type_t type
}
Serial.print(F(" "));
display_obj.display_buffer->add(display_string);
#endif
if (mem_check) {

4
esp32_marauder/utils.h
View File

@@ -194,10 +194,8 @@ inline String macToString(const uint8_t macAddr[6]) {
inline void convertMacStringToUint8(const String& macStr, uint8_t macAddr[6]) {
// Ensure the input string is in the format "XX:XX:XX:XX:XX:XX"
if (macStr.length() != 17) {
Serial.println("Invalid MAC address format");
if (macStr.length() != 17)
return;
}
// Parse the MAC address string and fill the uint8_t array
for (int i = 0; i < 6; i++) {