mirror of
https://github.com/justcallmekoko/ESP32Marauder.git
synced 2025-12-22 23:26:45 -08:00
Adjust eapol monitor UI
This commit is contained in:
@@ -210,9 +210,12 @@ void Display::tftDrawEapolColorKey(bool filter)
|
|||||||
//Display color key
|
//Display color key
|
||||||
tft.setTextSize(1); tft.setTextColor(TFT_WHITE);
|
tft.setTextSize(1); tft.setTextColor(TFT_WHITE);
|
||||||
tft.fillRect(14, 0, 15, 8, TFT_CYAN); tft.setCursor(30, 0); tft.println(" - EAPOL");
|
tft.fillRect(14, 0, 15, 8, TFT_CYAN); tft.setCursor(30, 0); tft.println(" - EAPOL");
|
||||||
if (filter)
|
if (filter) {
|
||||||
|
uint16_t y = tft.getCursorY();
|
||||||
|
tft.setCursor(14, y);
|
||||||
tft.println("Filter Active");
|
tft.println("Filter Active");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void Display::tftDrawColorKey()
|
void Display::tftDrawColorKey()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2986,7 +2986,7 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color)
|
|||||||
delay(10);
|
delay(10);
|
||||||
|
|
||||||
display_obj.tftDrawGraphObjects(x_scale); //draw graph objects
|
display_obj.tftDrawGraphObjects(x_scale); //draw graph objects
|
||||||
display_obj.tftDrawEapolColorKey();
|
display_obj.tftDrawEapolColorKey(this->filterActive());
|
||||||
display_obj.tftDrawChannelScaleButtons(set_channel);
|
display_obj.tftDrawChannelScaleButtons(set_channel);
|
||||||
display_obj.tftDrawExitScaleButtons();
|
display_obj.tftDrawExitScaleButtons();
|
||||||
#endif
|
#endif
|
||||||
@@ -7387,14 +7387,7 @@ void WiFiScan::eapolSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool filter = false;
|
bool filter = wifi_scan_obj.filterActive();
|
||||||
|
|
||||||
for (int i = 0; i < access_points->size(); i++) {
|
|
||||||
if (access_points->get(i).selected) {
|
|
||||||
filter = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for and apply filters
|
// Check for and apply filters
|
||||||
if (filter) {
|
if (filter) {
|
||||||
|
|||||||
Reference in New Issue
Block a user