kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

feat: Mesh-tab wifi map + exclude screen fix (#10038)

Browse Source 
* fix MESHTASTIC_EXCLUDE_SCREEN

* mesh-tab map constraints (2 MB PSRAM)

* point MUI commit to the related PR

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
This commit is contained in:
Manuel
2026-04-01 08:03:34 -05:00
committed by GitHub
co-authored by GitHub Ben Meadors
parent fc6c89abeb
commit 8dc3c0541b
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/input/InputBroker.cpp
+4 -1
View File
@@ -299,6 +299,7 @@ void InputBroker::Init()
// Buttons. Moved here cause we need NodeDB to be initialized // Buttons. Moved here cause we need NodeDB to be initialized
// If your variant.h has a BUTTON_PIN defined, go ahead and define BUTTON_ACTIVE_LOW and BUTTON_ACTIVE_PULLUP // If your variant.h has a BUTTON_PIN defined, go ahead and define BUTTON_ACTIVE_LOW and BUTTON_ACTIVE_PULLUP
UserButtonThread = new ButtonThread("UserButton"); UserButtonThread = new ButtonThread("UserButton");
#if !MESHTASTIC_EXCLUDE_SCREEN
if (screen) { if (screen) {
ButtonConfig userConfig; ButtonConfig userConfig;
userConfig.pinNumber = (uint8_t)_pinNum; userConfig.pinNumber = (uint8_t)_pinNum;
@@ -317,7 +318,9 @@ void InputBroker::Init()
userConfig.longPressTime = 500; userConfig.longPressTime = 500;
userConfig.longLongPress = INPUT_BROKER_SHUTDOWN; userConfig.longLongPress = INPUT_BROKER_SHUTDOWN;
UserButtonThread->initButton(userConfig); UserButtonThread->initButton(userConfig);
} else { } else
#endif
{
ButtonConfig userConfigNoScreen; ButtonConfig userConfigNoScreen;
userConfigNoScreen.pinNumber = (uint8_t)_pinNum; userConfigNoScreen.pinNumber = (uint8_t)_pinNum;
userConfigNoScreen.activeLow = BUTTON_ACTIVE_LOW; userConfigNoScreen.activeLow = BUTTON_ACTIVE_LOW;
variants/esp32s3/mesh-tab/platformio.ini
+5 -1
View File
@@ -12,6 +12,7 @@ build_flags = ${esp32s3_base.build_flags}
-D CONFIG_ARDUHAL_ESP_LOG -D CONFIG_ARDUHAL_ESP_LOG
-D CONFIG_ARDUHAL_LOG_COLORS=1 -D CONFIG_ARDUHAL_LOG_COLORS=1
-D CONFIG_DISABLE_HAL_LOCKS=1 -D CONFIG_DISABLE_HAL_LOCKS=1
-D MESHTASTIC_EXCLUDE_SCREEN=1
-D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1 -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
-D MESHTASTIC_EXCLUDE_INPUTBROKER=1 -D MESHTASTIC_EXCLUDE_INPUTBROKER=1
-D MESHTASTIC_EXCLUDE_BLUETOOTH=1 -D MESHTASTIC_EXCLUDE_BLUETOOTH=1
@@ -31,7 +32,10 @@ build_flags = ${esp32s3_base.build_flags}
-D HAS_SCREEN=0 -D HAS_SCREEN=0
-D HAS_TFT=1 -D HAS_TFT=1
-D USE_PIN_BUZZER -D USE_PIN_BUZZER
-D RAM_SIZE=1024 -D MAP_TILES_GREY ; required for 2MB PSRAM
-D RAM_SIZE=1432
-D STBI_ARENA_SIZE=450000
-D LV_CACHE_DEF_SIZE=0
-D LGFX_DRIVER_TEMPLATE -D LGFX_DRIVER_TEMPLATE
-D LGFX_DRIVER=LGFX_GENERIC -D LGFX_DRIVER=LGFX_GENERIC
-D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_GENERIC.h\" -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_GENERIC.h\"