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

Update status bar

Browse Source
This commit is contained in:
Just Call Me Koko
2020-07-09 20:29:26 -04:00
parent 1a4136137d
commit 6490a12b30
3 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
esp32_marauder/MenuFunctions.cpp
View File

@@ -180,12 +180,21 @@ void MenuFunctions::updateStatusBar()
}
display_obj.tft.setTextColor(TFT_WHITE, STATUSBAR_COLOR);
// WiFi Channel Stuff
if (wifi_scan_obj.set_channel != wifi_scan_obj.old_channel) {
wifi_scan_obj.old_channel = wifi_scan_obj.set_channel;
display_obj.tft.fillRect(75, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, 75, 0, 2);
display_obj.tft.fillRect(50, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, 50, 0, 2);
}
// RAM Stuff
wifi_scan_obj.freeRAM();
if (wifi_scan_obj.free_ram != wifi_scan_obj.old_free_ram) {
wifi_scan_obj.old_free_ram = wifi_scan_obj.free_ram;
display_obj.tft.fillRect(100, 0, 60, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
display_obj.tft.drawString((String)wifi_scan_obj.free_ram + "B", 100, 0, 2);
}
// Draw battery info
if (battery_obj.i2c_supported)
{
@@ -252,9 +261,17 @@ void MenuFunctions::drawStatusBar()
display_obj.tft.drawString((String)temp_obj.current_temp + " C", 4, 0, 2);
display_obj.tft.setTextColor(TFT_WHITE, STATUSBAR_COLOR);
// WiFi Channel Stuff
wifi_scan_obj.old_channel = wifi_scan_obj.set_channel;
display_obj.tft.fillRect(75, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, 75, 0, 2);
display_obj.tft.fillRect(50, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, 50, 0, 2);
// RAM Stuff
wifi_scan_obj.freeRAM();
wifi_scan_obj.old_free_ram = wifi_scan_obj.free_ram;
display_obj.tft.fillRect(100, 0, 60, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
display_obj.tft.drawString((String)wifi_scan_obj.free_ram + "B", 100, 0, 2);
// Draw battery info
if (battery_obj.i2c_supported)

1
esp32_marauder/WiFiScan.cpp
View File

@@ -256,6 +256,7 @@ String WiFiScan::freeRAM()
{
char s[150];
sprintf(s, "RAM Free: %u bytes", system_get_free_heap_size());
this->free_ram = String(system_get_free_heap_size());
return String(s);
}

3
esp32_marauder/WiFiScan.h
View File

@@ -156,6 +156,9 @@ class WiFiScan
bool orient_display = false;
String free_ram = "";
String old_free_ram = "";
wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
String getStaMAC();