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

Fix mini and v6 status bar channel refresh

Browse Source
This commit is contained in:
Just Call Me Koko
2024-02-24 19:59:23 -05:00
parent 2cf39700ee
commit 4188819965
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
esp32_marauder/MenuFunctions.cpp
View File

@@ -928,6 +928,8 @@ void MenuFunctions::updateStatusBar()
{ {
display_obj.tft.setTextSize(1); display_obj.tft.setTextSize(1);
bool status_changed = false;
#if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER) #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER)
display_obj.tft.setFreeFont(NULL); display_obj.tft.setFreeFont(NULL);
#endif #endif
@@ -937,6 +939,7 @@ void MenuFunctions::updateStatusBar()
if (this->old_gps_sat_count != gps_obj.getNumSats()) { if (this->old_gps_sat_count != gps_obj.getNumSats()) {
this->old_gps_sat_count = gps_obj.getNumSats(); this->old_gps_sat_count = gps_obj.getNumSats();
display_obj.tft.fillRect(0, 0, 240, STATUS_BAR_WIDTH, STATUSBAR_COLOR); display_obj.tft.fillRect(0, 0, 240, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
status_changed = true;
} }
// GPS Stuff // GPS Stuff
@@ -968,9 +971,13 @@ void MenuFunctions::updateStatusBar()
display_obj.tft.setTextColor(TFT_WHITE, STATUSBAR_COLOR); display_obj.tft.setTextColor(TFT_WHITE, STATUSBAR_COLOR);
// WiFi Channel Stuff // WiFi Channel Stuff
if (wifi_scan_obj.set_channel != wifi_scan_obj.old_channel) { if ((wifi_scan_obj.set_channel != wifi_scan_obj.old_channel) || (status_changed)) {
wifi_scan_obj.old_channel = wifi_scan_obj.set_channel; wifi_scan_obj.old_channel = wifi_scan_obj.set_channel;
#if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER)
display_obj.tft.fillRect(43, 0, TFT_WIDTH * 0.21, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
#else
display_obj.tft.fillRect(50, 0, TFT_WIDTH * 0.21, STATUS_BAR_WIDTH, STATUSBAR_COLOR); display_obj.tft.fillRect(50, 0, TFT_WIDTH * 0.21, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
#endif
#ifdef HAS_ILI9341 #ifdef HAS_ILI9341
display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, 50, 0, 2); display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, 50, 0, 2);
#endif #endif
@@ -1077,7 +1084,11 @@ void MenuFunctions::drawStatusBar()
// WiFi Channel Stuff // WiFi Channel Stuff
wifi_scan_obj.old_channel = wifi_scan_obj.set_channel; wifi_scan_obj.old_channel = wifi_scan_obj.set_channel;
display_obj.tft.fillRect(50, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR); #if defined(MARAUDER_MINI) || defined(MARAUDER_M5STICKC) || defined(MARAUDER_REV_FEATHER)
display_obj.tft.fillRect(43, 0, TFT_WIDTH * 0.21, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
#else
display_obj.tft.fillRect(50, 0, TFT_WIDTH * 0.21, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
#endif
#ifdef HAS_ILI9341 #ifdef HAS_ILI9341
display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, 50, 0, 2); display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, 50, 0, 2);
#endif #endif

4
esp32_marauder/configs.h
View File

@@ -8,9 +8,9 @@
//// BOARD TARGETS //// BOARD TARGETS
//#define MARAUDER_M5STICKC //#define MARAUDER_M5STICKC
//#define MARAUDER_MINI #define MARAUDER_MINI
//#define MARAUDER_V4 //#define MARAUDER_V4
#define MARAUDER_V6 //#define MARAUDER_V6
//#define MARAUDER_V6_1 //#define MARAUDER_V6_1
//#define MARAUDER_KIT //#define MARAUDER_KIT
//#define GENERIC_ESP32 //#define GENERIC_ESP32