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

.trunk/trunk.yaml

@@ -8,8 +8,8 @@ plugins:
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - checkov@3.2.511
-    - renovate@43.92.1
+    - checkov@3.2.513
+    - renovate@43.100.0
     - prettier@3.8.1
     - trufflehog@3.94.1
     - yamllint@1.38.0

bin/generate_ci_matrix.py

@@ -43,7 +43,7 @@ for pio_env in pio_envs:
   env = {
     "ci": {"board": pio_env, "platform": env_platform},
     "board_level": cfg.get(f"env:{pio_env}", "board_level", default=None),
-    "board_check": bool(cfg.get(f"env:{pio_env}", "board_check", default=False)),
+    "board_check": cfg.get(f"env:{pio_env}", "board_check", default="false").strip().lower() == "true",
   }
   all_envs.append(env)
 

boards/ttgo-tbeam.json

@@ -0,0 +1,29 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": "-DARDUINO_T_Beam",
+    "f_cpu": "240000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "mcu": "esp32",
+    "variant": "tbeam"
+  },
+  "connectivity": ["wifi", "bluetooth", "can", "ethernet"],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
+  "frameworks": ["arduino", "espidf"],
+  "name": "TTGO T-Beam (PSRAM Disabled)",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 1310720,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://github.com/LilyGO/TTGO-T-Beam",
+  "vendor": "TTGO"
+}

variants/esp32/nano-g1-explorer/platformio.ini

@@ -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

variants/esp32/nano-g1/platformio.ini

@@ -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

variants/esp32/station-g1/platformio.ini

@@ -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

variants/esp32/tbeam/platformio.ini

@@ -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
 

variants/esp32/tbeam_v07/platformio.ini

@@ -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

variants/esp32s3/t5s3_epaper/platformio.ini

@@ -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}

variants/nrf52840/wio-sdk-wm1110/platformio.ini

@@ -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