Merge branch 'justcallmekoko:develop' into develop

This commit is contained in:
amec0e
2025-05-27 22:55:27 +01:00
committed by GitHub
2 changed files with 16 additions and 3 deletions

View File

@@ -5357,8 +5357,10 @@ void WiFiScan::rawSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
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(" RSSI: ");
display_string.concat((String)access_points->get(targ_index).rssi);
#ifndef HAS_MINI_SCREEN
display_string.concat(" RSSI: ");
display_string.concat((String)access_points->get(targ_index).rssi);
#endif
int temp_len = display_string.length();
for (int i = 0; i < 50 - temp_len; i++)
{
@@ -5366,6 +5368,17 @@ void WiFiScan::rawSnifferCallback(void* buf, wifi_promiscuous_pkt_type_t type)
}
#ifdef HAS_SCREEN
display_obj.display_buffer->add(display_string);
#ifdef HAS_MINI_SCREEN
display_string = "";
display_string.concat("RSSI: ");
display_string.concat((String)access_points->get(targ_index).rssi);
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
#endif
}
else

View File

@@ -26,7 +26,7 @@
//#define MARAUDER_CYD_GUITION // ESP32-2432S024 GUITION
//// END BOARD TARGETS
#define MARAUDER_VERSION "v1.5.1"
#define MARAUDER_VERSION "v1.5.2"
#define GRAPH_REFRESH 100