Skip to content

Commit 8dc3c05

Browse files
mverch67thebentern
andauthored
feat: Mesh-tab wifi map + exclude screen fix (meshtastic#10038)
* 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>
1 parent fc6c89a commit 8dc3c05

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

src/input/InputBroker.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ void InputBroker::Init()
299299
// Buttons. Moved here cause we need NodeDB to be initialized
300300
// If your variant.h has a BUTTON_PIN defined, go ahead and define BUTTON_ACTIVE_LOW and BUTTON_ACTIVE_PULLUP
301301
UserButtonThread = new ButtonThread("UserButton");
302+
#if !MESHTASTIC_EXCLUDE_SCREEN
302303
if (screen) {
303304
ButtonConfig userConfig;
304305
userConfig.pinNumber = (uint8_t)_pinNum;
@@ -317,7 +318,9 @@ void InputBroker::Init()
317318
userConfig.longPressTime = 500;
318319
userConfig.longLongPress = INPUT_BROKER_SHUTDOWN;
319320
UserButtonThread->initButton(userConfig);
320-
} else {
321+
} else
322+
#endif
323+
{
321324
ButtonConfig userConfigNoScreen;
322325
userConfigNoScreen.pinNumber = (uint8_t)_pinNum;
323326
userConfigNoScreen.activeLow = BUTTON_ACTIVE_LOW;

variants/esp32s3/mesh-tab/platformio.ini

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ build_flags = ${esp32s3_base.build_flags}
1212
-D CONFIG_ARDUHAL_ESP_LOG
1313
-D CONFIG_ARDUHAL_LOG_COLORS=1
1414
-D CONFIG_DISABLE_HAL_LOCKS=1
15+
-D MESHTASTIC_EXCLUDE_SCREEN=1
1516
-D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
1617
-D MESHTASTIC_EXCLUDE_INPUTBROKER=1
1718
-D MESHTASTIC_EXCLUDE_BLUETOOTH=1
@@ -31,7 +32,10 @@ build_flags = ${esp32s3_base.build_flags}
3132
-D HAS_SCREEN=0
3233
-D HAS_TFT=1
3334
-D USE_PIN_BUZZER
34-
-D RAM_SIZE=1024
35+
-D MAP_TILES_GREY ; required for 2MB PSRAM
36+
-D RAM_SIZE=1432
37+
-D STBI_ARENA_SIZE=450000
38+
-D LV_CACHE_DEF_SIZE=0
3539
-D LGFX_DRIVER_TEMPLATE
3640
-D LGFX_DRIVER=LGFX_GENERIC
3741
-D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_GENERIC.h\"

0 commit comments

Comments
 (0)