diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini index fd62a60064..9518991a62 100644 --- 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 index 35c7974af1..c6a16c7ebc 100644 --- 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 index 8bffdcaa78..0016d61312 100644 --- 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 index fcf687461d..78d81358e6 100644 --- a/variants/portduino/platformio.ini +++ b/variants/portduino/platformio.ini @@ -3,6 +3,7 @@ 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 || : @@ -10,26 +11,23 @@ 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} - +<../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} - - - +<../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> \ No newline at end of file diff --git a/variants/seeed-sensecap-indicator/platformio.ini b/variants/seeed-sensecap-indicator/platformio.ini index 0fd006865d..a6e75f9b19 100644 --- 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,22 +25,17 @@ 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 @@ -47,17 +43,7 @@ build_flags = ${esp32_base.build_flags} -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 index bd18111b62..f84fc08b93 100644 --- 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/bb_captouch@1.2.2 ; alternative touch library supporting GT911 - earlephilhower/ESP8266Audio@^1.9.9 - earlephilhower/ESP8266SAM@^1.0.1 \ No newline at end of file diff --git a/variants/tlora_t3s3_v1/platformio.ini b/variants/tlora_t3s3_v1/platformio.ini index c062dbd7b0..0b27b881b5 100644 --- a/variants/tlora_t3s3_v1/platformio.ini +++ b/variants/tlora_t3s3_v1/platformio.ini @@ -7,72 +7,3 @@ upload_protocol = esptool build_flags = ${esp32_base.build_flags} -D TLORA_T3S3_V1 -I variants/tlora_t3s3_v1 -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely. - - -[env:tlora-t3s3-tft] -extends = esp32s3_base -board = tlora-t3s3-v1 -;board_check = true -upload_protocol = esp-builtin - -build_flags = ${esp32_base.build_flags} - -D TLORA_T3S3_V1 - -D MESHTASTIC_EXCLUDE_SCREEN=1 - -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1 - -D MESHTASTIC_EXCLUDE_INPUTBROKER=1 - -D MESHTASTIC_EXCLUDE_PAXCOUNTER=1 - -D MESHTASTIC_EXCLUDE_WEBSERVER=1 - -D MESHTASTIC_EXCLUDE_GPS=1 - -D MESHTASTIC_EXCLUDE_AUDIO=1 - -D MESHTASTIC_EXCLUDE_POWER_TELEMETRY=1 - -D MESHTASTIC_EXCLUDE_ATAK=1 - -D MESHTASTIC_EXCLUDE_REMOTEHARDWARE=1 - -D MAX_NUM_NODES=250 - -D HAS_SCREEN=0 - -D HAS_TFT=1 - -D RAM_SIZE=1024 - -D LV_LVGL_H_INCLUDE_SIMPLE - -D LV_CONF_INCLUDE_SIMPLE - -D LV_COMP_CONF_INCLUDE_SIMPLE - -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_LOG=0 - -D USE_LOG_DEBUG - -D LOG_DEBUG_INC=\"DebugConfiguration.h\" -; -D CALIBRATE_TOUCH=0 - -D LGFX_DRIVER_TEMPLATE - -D LGFX_DRIVER=LGFX_GENERIC - -D LGFX_PANEL=ST7789 - -D LGFX_OFFSET_ROTATION=1 - -D LGFX_TOUCH=XPT2046 - -D LGFX_PIN_SCK=12 - -D LGFX_PIN_MOSI=15 - -D LGFX_PIN_MISO=16 - -D LGFX_PIN_DC=47 - -D LGFX_PIN_CS=48 - -D LGFX_PIN_RST=34 - -D LGFX_PIN_BL=35 - -D LGFX_TOUCH_INT=38 - -D LGFX_TOUCH_CS=39 - -D LGFX_TOUCH_CLK=12 - -D LGFX_TOUCH_DO=15 - -D LGFX_TOUCH_DIN=16 - -D LGFX_TOUCH_X_MIN=300 - -D LGFX_TOUCH_X_MAX=3900 - -D LGFX_TOUCH_Y_MIN=400 - -D LGFX_TOUCH_Y_MAX=3900 - -D VIEW_320x240 -; -D USE_DOUBLE_BUFFER - -D USE_PACKET_API - -I variants/tlora_t3s3_v1 - -I lib/device-ui/generated/ui_320x240 -build_src_filter = ${esp32_base.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/unphone/platformio.ini b/variants/unphone/platformio.ini index b41848e134..8ffcab049d 100644 --- a/variants/unphone/platformio.ini +++ b/variants/unphone/platformio.ini @@ -1,18 +1,15 @@ ; platformio.ini for unphone meshtastic [env:unphone] - extends = esp32s3_base -board = unphone9 +board = unphone +board_level = extra upload_speed = 921600 monitor_speed = 115200 monitor_filters = esp32_exception_decoder -build_unflags = - ${esp32s3_base.build_unflags} - -D ARDUINO_USB_MODE - -build_flags = ${esp32_base.build_flags} +build_flags = + ${esp32s3_base.build_flags} -D UNPHONE -I variants/unphone -D ARDUINO_USB_MODE=0 @@ -22,8 +19,11 @@ build_flags = ${esp32_base.build_flags} -D UNPHONE_UI0=0 -D UNPHONE_LORA=0 -D UNPHONE_FACTORY_MODE=0 + -D USE_SX127x -build_src_filter = ${esp32_base.build_src_filter} +<../variants/unphone> +build_src_filter = + ${esp32s3_base.build_src_filter} + +<../variants/unphone> lib_deps = ${esp32s3_base.lib_deps} lovyan03/LovyanGFX@ 1.1.16 @@ -32,25 +32,15 @@ lib_deps = ${esp32s3_base.lib_deps} [env:unphone-tft] -extends = esp32s3_base -board_level = extra -board = unphone +extends = env:unphone +board_level = main board_build.partitions = default_8MB.csv -monitor_speed = 115200 -monitor_filters = esp32_exception_decoder -build_flags = ${esp32_base.build_flags} - -D UNPHONE - -D UNPHONE_ACCEL=0 - -D UNPHONE_TOUCHS=0 - -D UNPHONE_SDCARD=0 - -D UNPHONE_UI0=0 - -D UNPHONE_LORA=0 - -D UNPHONE_FACTORY_MODE=0 +build_flags = + ${env:unphone.build_flags} -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1 -D MESHTASTIC_EXCLUDE_INPUTBROKER=1 -D MESHTASTIC_EXCLUDE_BLUETOOTH=1 -D MESHTASTIC_EXCLUDE_WEBSERVER=1 - -D USE_SX127x -D MAX_NUM_NODES=200 -D MAX_THREADS=40 -D HAS_SCREEN=0 @@ -71,18 +61,12 @@ build_flags = ${esp32_base.build_flags} -D CALIBRATE_TOUCH=0 -D LGFX_DRIVER=LGFX_UNPHONE_V9 -D VIEW_320x240 -; -D USE_DOUBLE_BUFFER -D USE_PACKET_API -I lib/device-ui/generated/ui_320x240 - -I variants/unphone -build_src_filter = ${esp32_base.build_src_filter} +<../variants/unphone> +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 = ${esp32s3_base.lib_deps} - lovyan03/LovyanGFX@^1.1.16 - https://gitlab.com/hamishcunningham/unphonelibrary#meshtastic@9.0.0 - adafruit/Adafruit NeoPixel@1.12.0 \ No newline at end of file