Merge branch 'master' into store-and-forward

variants/unphone/platformio.ini

@@ -3,6 +3,7 @@
 [env:unphone]
 extends = esp32s3_base
 board = unphone
+board_build.partitions = default_8MB.csv
 upload_speed = 921600
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder
@@ -32,7 +33,6 @@ lib_deps = ${esp32s3_base.lib_deps}
 
 [env:unphone-tft]
 extends = env:unphone
-board_build.partitions = default_8MB.csv
 build_flags =
   ${env:unphone.build_flags}
   -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
@@ -42,10 +42,10 @@ build_flags =
   -D MESHTASTIC_EXCLUDE_SERIAL=1
   -D MESHTASTIC_EXCLUDE_SOCKETAPI=1
   -D INPUTDRIVER_BUTTON_TYPE=21
-  -D MAX_NUM_NODES=200
   -D MAX_THREADS=40
   -D HAS_SCREEN=0
   -D HAS_TFT=1
+  -D HAS_SDCARD
   -D DISPLAY_SET_RESOLUTION
   -D RAM_SIZE=3072
 	-D LV_LVGL_H_INCLUDE_SIMPLE
@@ -63,11 +63,7 @@ build_flags =
   -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_UNPHONE.h\"
   -D VIEW_320x240
   -D USE_PACKET_API
-	-I lib/device-ui/generated/ui_320x240
 
-build_src_filter =
-  ${env:unphone.build_src_filter}
-  +<../lib/device-ui/generated/ui_320x240>
-  +<../lib/device-ui/resources>
-  +<../lib/device-ui/locale>
-  +<../lib/device-ui/source>
+lib_deps =
+  ${env:unphone.lib_deps}
+  ${device-ui_base.lib_deps}

variants/unphone/variant.h

@@ -48,8 +48,10 @@
 #undef GPS_RX_PIN
 #undef GPS_TX_PIN
 
+
 // #define HAS_SDCARD 1 // causes hang if defined
 #define SDCARD_USE_HSPI
+
 #define SD_SPI_FREQUENCY 25000000
 #define SDCARD_CS 43