Streamline board definitions for first tech preview. (#5390)

* Streamline board definitions for first tech preview. TBD: Indicator Support * add point-of-checkin * use board/unphone.json --------- Co-authored-by: mverch67 <[email protected]>
meshtastic · Nov 19, 2024 · 630568c · 630568c
1 parent b1aa23c
commit 630568c
Show file tree

Hide file tree

Showing 8 changed files with 98 additions and 202 deletions.
diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini
@@ -1,10 +1,10 @@
 [nrf52_base]
 ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files
-platform = platformio/nordicnrf52@^10.5.0
+platform = platformio/nordicnrf52@^10.6.0
 extends = arduino_base
 platform_packages =
   ; our custom Git version until they merge our PR
-  framework-arduinoadafruitnrf52 @ https://github.com/geeksville/Adafruit_nRF52_Arduino.git
+  framework-arduinoadafruitnrf52 @ https://github.com/geeksville/Adafruit_nRF52_Arduino.git#4f591d0f71f75e5128fab9dc42ac72f1696cf89f
   toolchain-gccarmnoneeabi@~1.90301.0
 build_type = debug
 build_flags =

diff --git a/src/main.cpp b/src/main.cpp
@@ -294,7 +294,6 @@ void setup()
 #endif
 
     powerMonInit();
-
     serialSinceMsec = millis();
 
     LOG_INFO("\n\n//\\ E S H T /\\ S T / C\n");

diff --git a/variants/picomputer-s3/platformio.ini b/variants/picomputer-s3/platformio.ini
@@ -1,7 +1,8 @@
-[env:picomputer-s3-oled]
+[env:picomputer-s3]
 extends = esp32s3_base
 board = bpi_picow_esp32_s3
-
+board_check = true
+board_level = extra
 ;OpenOCD flash method
 ;upload_protocol = esp-builtin
 ;Normal method
@@ -14,17 +15,19 @@ build_flags =
 
 lib_deps = 
   ${esp32s3_base.lib_deps}
-  lovyan03/LovyanGFX@^1.1.8
+  lovyan03/LovyanGFX@^1.1.16
 
+build_src_filter =
+  ${esp32s3_base.build_src_filter}
 
-[env:picomputer-s3]
-extends = esp32s3_base
-board = bpi_picow_esp32_s3
+
+[env:picomputer-s3-tft]
+extends = env:picomputer-s3
+board_level = main
 board_build.partitions = default_8MB.csv ; just for test
-board_check = true
-upload_protocol = esptool
-build_flags = ${esp32_base.build_flags}
-	-D PICOMPUTER_S3
+
+build_flags =
+  ${env:picomputer-s3.build_flags}
   -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
   -D MESHTASTIC_EXCLUDE_INPUTBROKER=1
   -D MESHTASTIC_EXCLUDE_BLUETOOTH=1
@@ -50,12 +53,11 @@ build_flags = ${esp32_base.build_flags}
 ;	-D USE_DOUBLE_BUFFER
   -D USE_PACKET_API
 	-I lib/device-ui/generated/ui_320x240
-  -I variants/picomputer-s3
-build_src_filter = ${esp32_base.build_src_filter}
+
+build_src_filter =
+  ${env:picomputer-s3.build_src_filter}
   +<../lib/device-ui/generated/ui_320x240>
   +<../lib/device-ui/resources>
   +<../lib/device-ui/locale>
   +<../lib/device-ui/source>
-lib_deps =
-  ${esp32_base.lib_deps}
-	lovyan03/LovyanGFX@^1.1.16
+
diff --git a/variants/portduino/platformio.ini b/variants/portduino/platformio.ini
@@ -3,33 +3,31 @@ extends = portduino_base
 ; The pkg-config commands below optionally add link flags.
 ; the || : is just a "or run the null command" to avoid returning an error code
 build_flags = ${portduino_base.build_flags} -O0 -I variants/portduino
+  -D ARCH_PORTDUINO
   -I /usr/include
   !pkg-config --libs libulfius --silence-errors || :
   !pkg-config --libs openssl --silence-errors || :
 board = cross_platform
 lib_deps = ${portduino_base.lib_deps}
 build_src_filter = ${portduino_base.build_src_filter}
 
-[env:native-tft-debug]
-extends = portduino_base
-build_type = debug
-build_flags = ${portduino_base.build_flags} -O0 -fsanitize=address -lX11 -linput -lxkbcommon
-  -D ARCH_PORTDUINO
+
+[env:native-tft]
+extends = env:native
+build_type = release
+build_flags = ${portduino_base.build_flags} -Os -lX11 -linput -lxkbcommon -ffunction-sections -fdata-sections -Wl,--gc-sections
   -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
-  -I variants/portduino
-  -I /usr/include
-  -D DEBUG_HEAP
   -D RAM_SIZE=16384
   -D USE_X11=1 ; enables usage of X11
   -D HAS_TFT=1
   -D HAS_SCREEN=0
-;  -D CALIBRATE_TOUCH=0
   -D LV_BUILD_TEST=0
-  -D LV_USE_LOG=1
-  -D LV_USE_SYSMON=1
-  -D LV_USE_PERF_MONITOR=1
-  -D LV_USE_MEM_MONITOR=0
+;  -D CALIBRATE_TOUCH=0
+  -D LV_USE_LOG=0
+  -D LV_USE_SYSMON=0
   -D LV_USE_PROFILER=0
+  -D LV_USE_PERF_MONITOR=0
+  -D LV_USE_MEM_MONITOR=0
   -D LV_USE_LIBINPUT=1
   -D LV_LVGL_H_INCLUDE_SIMPLE
   -D LV_CONF_INCLUDE_SIMPLE
@@ -38,12 +36,8 @@ build_flags = ${portduino_base.build_flags} -O0 -fsanitize=address -lX11 -linput
   -D LOG_DEBUG_INC=\"DebugConfiguration.h\"
   -D USE_PACKET_API
   -I lib/device-ui/generated/ui_320x240
-; The pkg-config commands below optionally add link flags.
-; the || : is just a "or run the null command" to avoid returning an error code
-  !pkg-config --libs libulfius --silence-errors || :
-  !pkg-config --libs openssl --silence-errors || :
-board = cross_platform
-build_src_filter = ${portduino_base.build_src_filter}
+
+build_src_filter = ${env:native.build_src_filter}
   -<graphics/TFTDisplay.cpp>
   +<../lib/device-ui/generated/ui_320x240>
   +<../lib/device-ui/generated/ui_320x240/fonts>
@@ -52,26 +46,25 @@ build_src_filter = ${portduino_base.build_src_filter}
   +<../lib/device-ui/locale>
   +<../lib/device-ui/source>
 
-
-[env:native-tft-release]
-extends = portduino_base
-build_type = release
-build_flags = ${portduino_base.build_flags} -Os -lX11 -linput -lxkbcommon -ffunction-sections -fdata-sections -Wl,--gc-sections
-  -D ARCH_PORTDUINO
+  
+[env:native-tft-debug]
+extends = env:native-tft
+build_type = debug
+board_level = extra
+build_flags = ${portduino_base.build_flags} -O0 -fsanitize=address -lX11 -linput -lxkbcommon
   -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
-  -I variants/portduino
-  -I /usr/include
+  -D DEBUG_HEAP
   -D RAM_SIZE=16384
   -D USE_X11=1 ; enables usage of X11
   -D HAS_TFT=1
   -D HAS_SCREEN=0
-  -D LV_BUILD_TEST=0
 ;  -D CALIBRATE_TOUCH=0
-  -D LV_USE_LOG=0
-  -D LV_USE_SYSMON=0
-  -D LV_USE_PROFILER=0
-  -D LV_USE_PERF_MONITOR=0
+  -D LV_BUILD_TEST=0
+  -D LV_USE_LOG=1
+  -D LV_USE_SYSMON=1
+  -D LV_USE_PERF_MONITOR=1
   -D LV_USE_MEM_MONITOR=0
+  -D LV_USE_PROFILER=0
   -D LV_USE_LIBINPUT=1
   -D LV_LVGL_H_INCLUDE_SIMPLE
   -D LV_CONF_INCLUDE_SIMPLE
@@ -80,16 +73,3 @@ build_flags = ${portduino_base.build_flags} -Os -lX11 -linput -lxkbcommon -ffunc
   -D LOG_DEBUG_INC=\"DebugConfiguration.h\"
   -D USE_PACKET_API
   -I lib/device-ui/generated/ui_320x240
-; The pkg-config commands below optionally add link flags.
-; the || : is just a "or run the null command" to avoid returning an error code
-  !pkg-config --libs libulfius --silence-errors || :
-  !pkg-config --libs openssl --silence-errors || :
-board = cross_platform
-build_src_filter = ${portduino_base.build_src_filter}
-  -<graphics/TFTDisplay.cpp>
-  +<../lib/device-ui/generated/ui_320x240>
-  +<../lib/device-ui/generated/ui_320x240/fonts>
-  +<../lib/device-ui/resources>
-  +<../lib/device-ui/portduino>
-  +<../lib/device-ui/locale>
-  +<../lib/device-ui/source>
diff --git a/variants/seeed-sensecap-indicator/platformio.ini b/variants/seeed-sensecap-indicator/platformio.ini
@@ -6,6 +6,7 @@ platform_packages =
 
 board = seeed-sensecap-indicator
 board_check = true
+board_level = extra
 upload_protocol = esptool
 
 build_flags = ${esp32_base.build_flags}
@@ -24,40 +25,25 @@ build_flags = ${esp32_base.build_flags}
 
 lib_deps = ${esp32s3_base.lib_deps}
   https://github.com/mverch67/LovyanGFX#develop
-  earlephilhower/ESP8266Audio@^1.9.7
+  earlephilhower/ESP8266Audio@^1.9.9
   earlephilhower/ESP8266SAM@^1.0.1
 
 
 [env:seeed-sensecap-indicator-tft]
-extends = esp32s3_base
-platform_packages =
-;    platformio/framework-arduinoespressif32 @ symlink:///home/manuel/Documents/PlatformIO/Projects/arduino-esp32
-    platformio/framework-arduinoespressif32 @ https://github.com/mverch67/arduino-esp32.git#add_tca9535 ; based on 2.0.16
-board = seeed-sensecap-indicator
-board_check = true
-board_level = extra
+extends = env:seeed-sensecap-indicator
+board_level = main
 board_build.partitions = default_8MB.csv ; must be here for some reason, board.json is not enough !?
-upload_protocol = esptool
-build_flags = ${esp32_base.build_flags}
-	-D SENSECAP_INDICATOR
+
+build_flags =
+  ${env:seeed-sensecap-indicator.build_flags}
   -D HAS_TELEMETRY=0
   -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
   -D MESHTASTIC_EXCLUDE_INPUTBROKER=1
   -D MESHTASTIC_EXCLUDE_BLUETOOTH=1
   -D MESHTASTIC_EXCLUDE_SCREEN=1
   -D MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1
   -D HAS_TELEMETRY=0
-  -D CONFIG_ARDUHAL_LOG_COLORS
   -D CONFIG_DISABLE_HAL_LOCKS=1
-  -D RADIOLIB_DEBUG_SPI=0
-  -D RADIOLIB_DEBUG_PROTOCOL=0
-  -D RADIOLIB_DEBUG_BASIC=0
-  -D RADIOLIB_VERBOSE_ASSERT=0
-  -D RADIOLIB_SPI_PARANOID=0
-  -D IO_EXPANDER=0x40
-  -D IO_EXPANDER_IRQ=42
-  ;-D IO_EXPANDER_DEBUG
-  -D USE_ARDUINO_HAL_GPIO
   -D MAX_NUM_NODES=250
   -D HAS_SCREEN=0
   -D HAS_TFT=1
@@ -81,15 +67,14 @@ build_flags = ${esp32_base.build_flags}
 ;	-D USE_DOUBLE_BUFFER
   -D USE_PACKET_API
 	-I lib/device-ui/generated/ui_320x240
-	-I variants/seeed-sensecap-indicator
-build_src_filter = ${esp32_base.build_src_filter}
+
+build_src_filter =
+  ${env:seeed-sensecap-indicator.build_src_filter}
   +<../lib/device-ui/generated/ui_320x240>
   +<../lib/device-ui/resources>
   +<../lib/device-ui/locale>
   +<../lib/device-ui/source>
-lib_deps = ${esp32s3_base.lib_deps}
-  https://github.com/mverch67/LovyanGFX#develop
-;  file:///home/manuel/Documents/PlatformIO/Projects/LovyanGFX
-  https://github.com/bitbank2/bb_captouch ; alternative touch library supporting FT6x36
-  earlephilhower/ESP8266Audio@^1.9.7
-  earlephilhower/ESP8266SAM@^1.0.1
+
+lib_deps =
+  ${env:seeed-sensecap-indicator.lib_deps}
+  https://github.com/bitbank2/bb_captouch.git#8f2f06462ff597847921739376a299db93612417 ; alternative touch library supporting FT6x36
diff --git a/variants/t-deck/platformio.ini b/variants/t-deck/platformio.ini
@@ -3,11 +3,29 @@
 extends = esp32s3_base
 board = t-deck
 board_level = extra
-board_build.partitions = default_16MB.csv ; just for test
 board_check = true
 upload_protocol = esptool
-build_flags = ${esp32_base.build_flags}
-	-D T_DECK
+
+build_flags = ${esp32s3_base.build_flags} 
+  -DT_DECK 
+  -DBOARD_HAS_PSRAM
+  -DMAX_THREADS=40
+  -DGPS_POWER_TOGGLE
+  -Ivariants/t-deck
+
+lib_deps = ${esp32s3_base.lib_deps}
+	lovyan03/LovyanGFX@^1.1.16
+  earlephilhower/ESP8266Audio@^1.9.9
+  earlephilhower/ESP8266SAM@^1.0.1
+
+
+[env:t-deck-tft]
+extends = env:t-deck
+board_build.partitions = default_16MB.csv ; just for test
+board_level = main
+
+build_flags =
+  ${env:t-deck.build_flags}
   -D CONFIG_DISABLE_HAL_LOCKS=1 ; "feels" to be a bit more stable without locks
   -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
   -D MESHTASTIC_EXCLUDE_INPUTBROKER=1
@@ -21,12 +39,10 @@ build_flags = ${esp32_base.build_flags}
   -D INPUTDRIVER_ENCODER_DOWN=15
   -D INPUTDRIVER_ENCODER_BTN=0
   -D MAX_NUM_NODES=250
-  -D MAX_THREADS=40
   -D HAS_SCREEN=0
   -D HAS_TFT=1
   -D USE_I2S_BUZZER
   -D RAM_SIZE=1024
-  -D GPS_POWER_TOGGLE
 	-D LV_LVGL_H_INCLUDE_SIMPLE
 	-D LV_CONF_INCLUDE_SIMPLE
 	-D LV_COMP_CONF_INCLUDE_SIMPLE
@@ -47,15 +63,14 @@ build_flags = ${esp32_base.build_flags}
 ;	-D USE_DOUBLE_BUFFER
   -D USE_PACKET_API
 	-I lib/device-ui/generated/ui_320x240
-	-I variants/t-deck
-build_src_filter = ${esp32_base.build_src_filter}
+
+build_src_filter =
+  ${env:t-deck.build_src_filter}
   +<../lib/device-ui/generated/ui_320x240>
   +<../lib/device-ui/resources>
   +<../lib/device-ui/locale>
   +<../lib/device-ui/source>
+
 lib_deps =
-  ${esp32_base.lib_deps}
-	lovyan03/LovyanGFX@^1.1.16
+  ${env:t-deck.lib_deps}
   bitbank2/[email protected] ; alternative touch library supporting GT911
-  earlephilhower/ESP8266Audio@^1.9.9
-  earlephilhower/ESP8266SAM@^1.0.1