Merge remote-tracking branch 'origin/master' into develop

2026-03-30 14:10:25 -05:00
parent 283ccb83d1 33d526f6f9
commit 0ac95e370b
10 changed files with 40 additions and 13 deletions
@@ -9,7 +9,7 @@ custom_meshtastic_display_name = Nano G1 Explorer
 custom_meshtastic_tags = B&Q

 extends = esp32_base
-board = ttgo-t-beam
+board = ttgo-tbeam
 build_flags = 
  ${esp32_base.build_flags}
  -D NANO_G1_EXPLORER
@@ -9,7 +9,7 @@ custom_meshtastic_display_name = Nano G1
 custom_meshtastic_tags = B&Q

 extends = esp32_base
-board = ttgo-t-beam
+board = ttgo-tbeam
 build_flags = 
  ${esp32_base.build_flags}
  -D NANO_G1
@@ -9,10 +9,7 @@ custom_meshtastic_display_name = Station G1
 custom_meshtastic_tags = B&Q

 extends = esp32_base
-board = ttgo-t-beam
-build_unflags =
-  ${esp32_common.build_unflags}
-  -DBOARD_HAS_PSRAM
+board = ttgo-tbeam
 build_flags = 
  ${esp32_base.build_flags}
  -D STATION_G1
@@ -10,14 +10,12 @@ custom_meshtastic_images = tbeam.svg
 custom_meshtastic_tags = LilyGo

 extends = esp32_base
-board = ttgo-t-beam
+board = ttgo-tbeam

 board_check = true
 build_flags = ${esp32_base.build_flags}
  -D TBEAM_V10
  -I variants/esp32/tbeam
-  -DBOARD_HAS_PSRAM
-  -mfix-esp32-psram-cache-issue
  -ULED_BUILTIN
 upload_speed = 921600

@@ -9,7 +9,7 @@ custom_meshtastic_tags = LilyGo

 board_level = extra
 extends = esp32_base
-board = ttgo-t-beam
+board = ttgo-tbeam
 build_flags = 
  ${esp32_base.build_flags}
  -D TBEAM_V07
@@ -30,6 +30,8 @@ lib_deps =

 [env:t5s3_epaper_inkhud]
 extends = t5s3_epaper_base, inkhud
+board_level = extra # inkhud port is incomplete
+board_check = false
 build_flags =
  ${t5s3_epaper_base.build_flags}
  ${inkhud.build_flags}
@@ -9,6 +9,7 @@ extra_scripts =

 # Remove adafruit USB serial from the build (it is incompatible with using the ch340 serial chip on this board)
 build_unflags =
+  ${nrf52840_base.build_unflags}
  -Ofast
  -Og
  -ggdb3