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

Improve signal monitor UI

Browse Source
This commit is contained in:
Just Call Me Koko
2025-09-29 15:16:06 -04:00
parent 08517d7587
commit 5088e0bfb4
3 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
esp32_marauder/BatteryInterface.cpp
View File

@@ -27,7 +27,7 @@ void BatteryInterface::RunSetup() {
#ifdef HAS_BATTERY
Serial.println("Checking for battery monitors...");
#ifndef HAS_AXP2101
Wire.begin(I2C_SDA, I2C_SCL);
@@ -99,7 +99,9 @@ int8_t BatteryInterface::getBatteryLevel() {
return percent;
}
if (this->has_axp2101) {
return this->power.getBatteryPercent();
}
#ifdef HAS_AXP2101
if (this->has_axp2101) {
return this->power.getBatteryPercent();
}
#endif
}

27
esp32_marauder/WiFiScan.cpp
View File

@@ -5882,11 +5882,13 @@ void WiFiScan::rawSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
if (!found)
return;
if ((targ_ap.rssi + 5 < snifferPacket->rx_ctrl.rssi) || (snifferPacket->rx_ctrl.rssi + 5 < targ_ap.rssi)) {
if ((targ_ap.rssi + 1 < snifferPacket->rx_ctrl.rssi) || (snifferPacket->rx_ctrl.rssi + 1 < targ_ap.rssi)) {
targ_ap.rssi = snifferPacket->rx_ctrl.rssi;
access_points->set(targ_index, targ_ap);
Serial.println((String)access_points->get(targ_index).essid + " RSSI: " + (String)access_points->get(targ_index).rssi);
display_string.concat((String)access_points->get(targ_index).essid);
/*display_string.concat((String)access_points->get(targ_index).essid);
#ifndef HAS_MINI_SCREEN
display_string.concat(" RSSI: ");
display_string.concat((String)access_points->get(targ_index).rssi);
@@ -5909,7 +5911,7 @@ void WiFiScan::rawSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
}
display_obj.display_buffer->add(display_string);
#endif
#endif
#endif*/
}
else
return;
@@ -8392,6 +8394,25 @@ void WiFiScan::main(uint32_t currentTime)
#ifdef HAS_ILI9341
this->signalAnalyzerLoop(currentTime);
#endif
if (currentTime - initTime >= this->channel_hop_delay * 500) {
initTime = millis();
display_obj.tft.fillRect(0,
(STATUS_BAR_WIDTH * 2) + 1 + EXT_BUTTON_WIDTH,
TFT_WIDTH,
TFT_HEIGHT - STATUS_BAR_WIDTH + 1,
TFT_BLACK);
display_obj.tft.setCursor(0, (STATUS_BAR_WIDTH * 2) + CHAR_WIDTH + EXT_BUTTON_WIDTH);
display_obj.tft.setTextSize(1);
display_obj.tft.setTextColor(TFT_WHITE, TFT_BLACK);
for (int y = 0; y < access_points->size(); y++) {
if (access_points->get(y).selected) {
display_obj.tft.println(access_points->get(y).essid + ": " + (String)access_points->get(y).rssi);
}
}
}
}
else if ((currentScanMode == WIFI_SCAN_CHAN_ANALYZER) ||
(currentScanMode == BT_SCAN_ANALYZER)) {

2
esp32_marauder/configs.h
View File

@@ -27,7 +27,7 @@
//#define MARAUDER_CYD_2USB // Another 2432S028 but it has tWo UsBs OoOoOoO
//#define MARAUDER_CYD_GUITION // ESP32-2432S024 GUITION
//#define MARAUDER_C5
#define MARAUDER_CARDPUTER
//#define MARAUDER_CARDPUTER
//// END BOARD TARGETS
#define MARAUDER_VERSION "v1.8.7"