Compare commits

..

No commits in common. "21867e595607d94e9806c0a864c848327d139859" and "630568c090db214f8e2b04e9fb8d2dc718214f81" have entirely different histories.

2 changed files with 21 additions and 23 deletions

View File

@ -1,30 +1,33 @@
[native_base]
[env:native]
extends = portduino_base
build_flags = ${portduino_base.build_flags} -I variants/portduino
; 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]
extends = native_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 = ${native_base.build_flags}
!pkg-config --libs libulfius --silence-errors || :
!pkg-config --libs openssl --silence-errors || :
[env:native-tft]
extends = native_base
extends = env:native
build_type = release
build_flags = ${native_base.build_flags} -Os -lX11 -linput -lxkbcommon -ffunction-sections -fdata-sections -Wl,--gc-sections
build_flags = ${portduino_base.build_flags} -Os -lX11 -linput -lxkbcommon -ffunction-sections -fdata-sections -Wl,--gc-sections
-D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
-D RAM_SIZE=16384
-D USE_X11=1
-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_USE_MEM_MONITOR=0
-D LV_USE_LIBINPUT=1
-D LV_LVGL_H_INCLUDE_SIMPLE
-D LV_CONF_INCLUDE_SIMPLE
@ -33,7 +36,8 @@ build_flags = ${native_base.build_flags} -Os -lX11 -linput -lxkbcommon -ffunctio
-D LOG_DEBUG_INC=\"DebugConfiguration.h\"
-D USE_PACKET_API
-I lib/device-ui/generated/ui_320x240
build_src_filter = ${native_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>
@ -42,15 +46,16 @@ build_src_filter = ${native_base.build_src_filter}
+<../lib/device-ui/locale>
+<../lib/device-ui/source>
[env:native-tft-debug]
extends = native_base
extends = env:native-tft
build_type = debug
board_level = extra
build_flags = ${native_base.build_flags} -O0 -fsanitize=address -lX11 -linput -lxkbcommon
build_flags = ${portduino_base.build_flags} -O0 -fsanitize=address -lX11 -linput -lxkbcommon
-D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
-D DEBUG_HEAP
-D RAM_SIZE=16384
-D USE_X11=1
-D USE_X11=1 ; enables usage of X11
-D HAS_TFT=1
-D HAS_SCREEN=0
; -D CALIBRATE_TOUCH=0
@ -68,4 +73,3 @@ build_flags = ${native_base.build_flags} -O0 -fsanitize=address -lX11 -linput -l
-D LOG_DEBUG_INC=\"DebugConfiguration.h\"
-D USE_PACKET_API
-I lib/device-ui/generated/ui_320x240
build_src_filter = ${env:native-tft.build_src_filter}

View File

@ -53,12 +53,6 @@ build_flags =
-D LV_USE_LOG=0
-D USE_LOG_DEBUG
-D LOG_DEBUG_INC=\"DebugConfiguration.h\"
-D RADIOLIB_BUILD_ARDUINO
-D RADIOLIB_DEBUG=0
-D RADIOLIB_DEBUG_BASIC=0
-D RADIOLIB_DEBUG_SPI=0
-D RADIOLIB_DEBUG_PROTOCOL=0
-D RADIOLIB_VERBOSE_ASSERT=1
-D RADIOLIB_SPI_PARANOID=0
-D CUSTOM_TOUCH_DRIVER
-D CALIBRATE_TOUCH=0