diff --git a/arch/rp2040/rp2040.ini b/arch/rp2040/rp2040.ini index 984d98bea..0add7de5d 100644 --- a/arch/rp2040/rp2040.ini +++ b/arch/rp2040/rp2040.ini @@ -12,7 +12,7 @@ build_flags = -D__PLAT_RP2040__ # -D _POSIX_THREADS build_src_filter = - ${arduino_base.build_src_filter} - - - - - - - - - - - + ${arduino_base.build_src_filter} - - - - - - - - - - lib_ignore = BluetoothOTA diff --git a/src/mesh/api/PacketAPI.cpp b/src/mesh/api/PacketAPI.cpp index 4942fa2ff..ac99d027f 100644 --- a/src/mesh/api/PacketAPI.cpp +++ b/src/mesh/api/PacketAPI.cpp @@ -1,3 +1,5 @@ +#ifdef USE_PACKET_API + #include "api/PacketAPI.h" #include "MeshService.h" #include "RadioInterface.h" @@ -73,3 +75,5 @@ bool PacketAPI::checkIsConnected() isConnected |= server->hasData(); return isConnected && server->available(); } + +#endif \ No newline at end of file diff --git a/variants/monteops_hw1/platformio.ini b/variants/monteops_hw1/platformio.ini index b813e7bc3..f9d260e74 100644 --- a/variants/monteops_hw1/platformio.ini +++ b/variants/monteops_hw1/platformio.ini @@ -4,7 +4,7 @@ extends = nrf52840_base board = wiscore_rak4631 build_flags = ${nrf52840_base.build_flags} -Ivariants/monteops_hw1 -D MONTEOPS_HW1 -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard" -build_src_filter = ${nrf52_base.build_src_filter} +<../variants/monteops_hw1> + + + - +build_src_filter = ${nrf52_base.build_src_filter} +<../variants/monteops_hw1> + + + lib_deps = ${nrf52840_base.lib_deps} ${networking_base.lib_deps} diff --git a/variants/portduino/platformio.ini b/variants/portduino/platformio.ini index 1d9211984..a54bdb59f 100644 --- a/variants/portduino/platformio.ini +++ b/variants/portduino/platformio.ini @@ -10,6 +10,38 @@ lib_deps = ${portduino_base.lib_deps} lovyan03/LovyanGFX@^1.1.12 build_src_filter = ${portduino_base.build_src_filter} +[env:native-tft-320x240] +extends = portduino_base +build_flags = ${portduino_base.build_flags} -O0 -fno-omit-frame-pointer -fsanitize=address + -I variants/portduino + -I /usr/include + -D DEBUG_HEAP + -D RAM_SIZE=4096 + -D HAS_TFT=1 + -D HAS_SCREEN=0 + -D LV_BUILD_TEST=0 + -D LV_LVGL_H_INCLUDE_SIMPLE + -D LV_CONF_INCLUDE_SIMPLE + -D LV_COMP_CONF_INCLUDE_SIMPLE + -D USE_LOG_DEBUG + -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 +lib_deps = ${portduino_base.lib_deps} + lovyan03/LovyanGFX@^1.1.12 +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/source> + + + [env:native-x11-320x240] extends = portduino_base build_flags = ${portduino_base.build_flags} -O0 -fno-omit-frame-pointer -fsanitize=address -lX11 @@ -30,10 +62,12 @@ build_flags = ${portduino_base.build_flags} -O0 -fno-omit-frame-pointer -fsaniti -D LV_COMP_CONF_INCLUDE_SIMPLE -D USE_LOG_DEBUG -D LOG_DEBUG_INC=\"DebugConfiguration.h\" + -D USE_PACKET_API -I lib/device-ui/generated/ui_320x240 board = cross_platform lib_deps = ${portduino_base.lib_deps} - https://github.com/lvgl/lv_drivers.git ; x11 is currently only supported in master branch, not in 8.3.0 + ; x11 is currently only supported in master branch, not in 6.1.1 + https://github.com/lvgl/lv_drivers.git#110089d7f4be4df34aa7efc17c8cdd911e562846 build_src_filter = ${portduino_base.build_src_filter} - +<../lib/device-ui/generated/ui_320x240> diff --git a/variants/rak10701/platformio.ini b/variants/rak10701/platformio.ini index 8476b2517..37f785e84 100644 --- a/variants/rak10701/platformio.ini +++ b/variants/rak10701/platformio.ini @@ -8,7 +8,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/rak10701 -D RAK_4631 -DEINK_DISPLAY_MODEL=GxEPD2_213_BN -DEINK_WIDTH=250 -DEINK_HEIGHT=122 -build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak10701> + + + - +build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak10701> + + + lib_deps = ${nrf52840_base.lib_deps} ${networking_base.lib_deps} diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini index 69641d251..b1bc2d9b5 100644 --- a/variants/rak4631/platformio.ini +++ b/variants/rak4631/platformio.ini @@ -8,7 +8,7 @@ build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631 -D RAK_4631 -DEINK_DISPLAY_MODEL=GxEPD2_213_BN -DEINK_WIDTH=250 -DEINK_HEIGHT=122 -build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak4631> + + + - +build_src_filter = ${nrf52_base.build_src_filter} +<../variants/rak4631> + + + lib_deps = ${nrf52840_base.lib_deps} ${networking_base.lib_deps} diff --git a/variants/t-deck/platformio.ini b/variants/t-deck/platformio.ini index 29a3ee51a..7f571adb3 100644 --- a/variants/t-deck/platformio.ini +++ b/variants/t-deck/platformio.ini @@ -24,6 +24,7 @@ build_flags = ${esp32_base.build_flags} -fno-omit-frame-pointer -D VIEW_CLASS=TFTView_320x240 -D VIEW_CLASS_INC=\"TFTView_320x240.h\" ; -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}