mirror of
https://github.com/justcallmekoko/ESP32Marauder.git
synced 2026-07-28 14:47:16 -07:00
Merge pull request #1360 from justcallmekoko/develop
Fix Mini status bar
This commit is contained in:
@@ -1111,7 +1111,7 @@ void MenuFunctions::updateStatusBar()
|
||||
|
||||
// Draw battery info
|
||||
MenuFunctions::battery(false);
|
||||
display_obj.tft.fillRect(SB_TOUCH_X, 0, 16, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
|
||||
display_obj.tft.fillRect(186, 0, 16, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
|
||||
|
||||
// Disable touch stuff
|
||||
#ifdef HAS_ILI9341
|
||||
@@ -1272,7 +1272,7 @@ void MenuFunctions::drawStatusBar()
|
||||
// RAM Stuff
|
||||
wifi_scan_obj.free_ram = String(esp_get_free_heap_size());
|
||||
wifi_scan_obj.old_free_ram = wifi_scan_obj.free_ram;
|
||||
display_obj.tft.fillRect(SB_MEM_X, 0, 60, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
|
||||
display_obj.tft.fillRect(100, 0, 60, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
|
||||
#ifdef HAS_FULL_SCREEN
|
||||
#ifndef HAS_PSRAM
|
||||
display_obj.tft.drawString("D:" + String(getDRAMUsagePercent()) + "%", SB_MEM_X, 0, 2);
|
||||
@@ -1288,7 +1288,7 @@ void MenuFunctions::drawStatusBar()
|
||||
|
||||
|
||||
MenuFunctions::battery(true);
|
||||
display_obj.tft.fillRect(SB_TOUCH_X, 0, 16, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
|
||||
display_obj.tft.fillRect(186, 0, 16, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
|
||||
|
||||
|
||||
// Disable touch stuff
|
||||
|
||||
Reference in New Issue
Block a user