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

Merge pull request #969 from justcallmekoko/develop

Browse Source 
Fix channel summary graph for Mini
This commit is contained in:
Just Call Me Koko
2025-11-04 10:35:45 -05:00
committed by GitHub
parent 3fc18d642b 5a928a7ae8
commit de2a916ad6
4 changed files with 60 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/nightly_build.yml vendored
View File

@@ -356,7 +356,7 @@ jobs:
name: ${{ needs.decide.outputs.short_sha }}_nightly
tag_name: nightly_${{ needs.decide.outputs.short_sha }}
prerelease: true
generate_release_notes: true
generate_release_notes: false
draft: false
files: |
esp32_marauder_v*.bin

48
esp32_marauder/MenuFunctions.cpp
View File

@@ -1128,6 +1128,18 @@ void MenuFunctions::main(uint32_t currentTime)
else
wifi_scan_obj.changeChannel(1);
}
else if (wifi_scan_obj.currentScanMode == WIFI_SCAN_CHAN_ACT) {
#ifndef HAS_DUAL_BAND
if (wifi_scan_obj.activity_page < MAX_CHANNEL / CHAN_PER_PAGE) {
wifi_scan_obj.activity_page++;
}
#else
if (wifi_scan_obj.activity_page < DUAL_BAND_CHANNELS / CHAN_PER_PAGE) {
wifi_scan_obj.activity_page++;
}
#endif
wifi_scan_obj.drawChannelLine();
}
}
if (menu_button == DOWN_BUTTON) {
if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) ||
@@ -1172,6 +1184,18 @@ void MenuFunctions::main(uint32_t currentTime)
else
wifi_scan_obj.changeChannel(14);
}
else if (wifi_scan_obj.currentScanMode == WIFI_SCAN_CHAN_ACT) {
#ifndef HAS_DUAL_BAND
if (wifi_scan_obj.activity_page > 1) {
wifi_scan_obj.activity_page--;
}
#else
if (wifi_scan_obj.activity_page > 0) {
wifi_scan_obj.activity_page--;
}
#endif
wifi_scan_obj.drawChannelLine();
}
}
if(menu_button == SELECT_BUTTON) {
current_menu->list->get(current_menu->selected).callable();
@@ -1272,6 +1296,18 @@ void MenuFunctions::main(uint32_t currentTime)
else
wifi_scan_obj.changeChannel(1);
}
else if (wifi_scan_obj.currentScanMode == WIFI_SCAN_CHAN_ACT) {
#ifndef HAS_DUAL_BAND
if (wifi_scan_obj.activity_page < MAX_CHANNEL / CHAN_PER_PAGE) {
wifi_scan_obj.activity_page++;
}
#else
if (wifi_scan_obj.activity_page < DUAL_BAND_CHANNELS / CHAN_PER_PAGE) {
wifi_scan_obj.activity_page++;
}
#endif
wifi_scan_obj.drawChannelLine();
}
}
#endif
#endif
@@ -1324,6 +1360,18 @@ void MenuFunctions::main(uint32_t currentTime)
else
wifi_scan_obj.changeChannel(14);
}
else if (wifi_scan_obj.currentScanMode == WIFI_SCAN_CHAN_ACT) {
#ifndef HAS_DUAL_BAND
if (wifi_scan_obj.activity_page > 1) {
wifi_scan_obj.activity_page--;
}
#else
if (wifi_scan_obj.activity_page > 0) {
wifi_scan_obj.activity_page--;
}
#endif
wifi_scan_obj.drawChannelLine();
}
}
#endif

14
esp32_marauder/WiFiScan.cpp
View File

@@ -2907,10 +2907,16 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color)
display_obj.tft.drawCentreString(text_table1[45],TFT_WIDTH / 2,16,2);
else if (scan_mode == WIFI_SCAN_CHAN_ANALYZER)
display_obj.tft.drawCentreString("Channel Analyzer", TFT_WIDTH / 2, 16, 2);
else if (scan_mode == WIFI_SCAN_CHAN_ACT)
else if (scan_mode == WIFI_SCAN_CHAN_ACT) {
display_obj.tft.drawCentreString("Channel Summary", TFT_WIDTH / 2, 16, 2);
this->drawChannelLine();
}
else if (scan_mode == WIFI_SCAN_PACKET_RATE)
display_obj.tft.drawCentreString("Packet Rate", TFT_WIDTH / 2, 16, 2);
#else
if (scan_mode == WIFI_SCAN_CHAN_ACT) {
this->drawChannelLine();
}
#endif
#ifdef HAS_ILI9341
display_obj.touchToExit();
@@ -8063,10 +8069,10 @@ void WiFiScan::signalAnalyzerLoop(uint32_t tick) {
void WiFiScan::drawChannelLine() {
#ifdef HAS_SCREEN
#ifdef HAS_FULL_SCREEN
//#ifdef HAS_FULL_SCREEN
display_obj.tft.fillRect(0, TFT_HEIGHT - GRAPH_VERT_LIM - (CHAR_WIDTH * 2), TFT_WIDTH, (CHAR_WIDTH * 2) - 1, TFT_MAGENTA);
#else
#endif
//#else
//#endif
Serial.println("Drawing channel line...");
#ifndef HAS_DUAL_BAND
for (int i = 1; i < CHAN_PER_PAGE + 1; i++) {

2
esp32_marauder/WiFiScan.h
View File

@@ -519,7 +519,6 @@ class WiFiScan
NimBLEAdvertisementData GetUniversalAdvertisementData(EBLEPayloadType type);
#endif
void drawChannelLine();
void fullARP();
bool readARP(IPAddress targ_ip);
bool singleARP(IPAddress ip_addr);
@@ -712,6 +711,7 @@ class WiFiScan
wifi_config_t ap_config;
void drawChannelLine();
#ifdef HAS_SCREEN
int8_t checkAnalyzerButtons(uint32_t currentTime);
#endif