update platform definitions to refactored lib

This commit is contained in:
mverch67 2024-04-15 14:59:12 +02:00
parent 2d2caf3dca
commit d83838d7d7
2 changed files with 6 additions and 7 deletions

View File

@ -7,7 +7,8 @@ build_flags = ${portduino_base.build_flags} -O0 -I variants/portduino -I /usr/in
!pkg-config --libs openssl --silence-errors || : !pkg-config --libs openssl --silence-errors || :
board = cross_platform board = cross_platform
lib_deps = ${portduino_base.lib_deps} lib_deps = ${portduino_base.lib_deps}
lovyan03/LovyanGFX@^1.1.12 ; lovyan03/LovyanGFX@^1.1.12
https://github.com/lovyan03/LovyanGFX.git#a0e0d14df3f6d24e589b77adb524cc3a75dbf8fa
build_src_filter = ${portduino_base.build_src_filter} build_src_filter = ${portduino_base.build_src_filter}
[env:native-tft-320x240] [env:native-tft-320x240]
@ -33,7 +34,8 @@ build_flags = ${portduino_base.build_flags} -O0 -fno-omit-frame-pointer -fsaniti
!pkg-config --libs openssl --silence-errors || : !pkg-config --libs openssl --silence-errors || :
board = cross_platform board = cross_platform
lib_deps = ${portduino_base.lib_deps} lib_deps = ${portduino_base.lib_deps}
lovyan03/LovyanGFX@^1.1.12 ; lovyan03/LovyanGFX@^1.1.12
https://github.com/lovyan03/LovyanGFX.git#a0e0d14df3f6d24e589b77adb524cc3a75dbf8fa
build_src_filter = ${portduino_base.build_src_filter} build_src_filter = ${portduino_base.build_src_filter}
-<graphics/TFTDisplay.cpp> -<graphics/TFTDisplay.cpp>
+<../lib/device-ui/generated/ui_320x240> +<../lib/device-ui/generated/ui_320x240>
@ -51,8 +53,6 @@ build_flags = ${portduino_base.build_flags} -O0 -fno-omit-frame-pointer -fsaniti
-D HAS_TFT=1 -D HAS_TFT=1
-D HAS_SCREEN=0 -D HAS_SCREEN=0
-D VIEW_320x240 -D VIEW_320x240
-D VIEW_CLASS=TFTView_320x240
-D VIEW_CLASS_INC=\"TFTView_320x240.h\"
-D DISP_HOR_RES=320 -D DISP_HOR_RES=320
-D DISP_VER_RES=240 -D DISP_VER_RES=240
-D LV_BUILD_TEST=0 -D LV_BUILD_TEST=0
@ -67,9 +67,11 @@ board = cross_platform
lib_deps = ${portduino_base.lib_deps} lib_deps = ${portduino_base.lib_deps}
; x11 is currently only supported in master branch, not in 6.1.1 ; x11 is currently only supported in master branch, not in 6.1.1
https://github.com/lvgl/lv_drivers.git#110089d7f4be4df34aa7efc17c8cdd911e562846 https://github.com/lvgl/lv_drivers.git#110089d7f4be4df34aa7efc17c8cdd911e562846
https://github.com/lovyan03/LovyanGFX.git#a0e0d14df3f6d24e589b77adb524cc3a75dbf8fa
build_src_filter = ${portduino_base.build_src_filter} build_src_filter = ${portduino_base.build_src_filter}
-<graphics/TFTDisplay.cpp> -<graphics/TFTDisplay.cpp>
+<../lib/device-ui/generated/ui_320x240> +<../lib/device-ui/generated/ui_320x240>
+<../lib/device-ui/generated/ui_320x240/fonts> +<../lib/device-ui/generated/ui_320x240/fonts>
+<../lib/device-ui/resources> +<../lib/device-ui/resources>
+<../lib/device-ui/source> +<../lib/device-ui/source>
+<mesh/sharedMem/>

View File

@ -19,10 +19,7 @@ build_flags = ${esp32_base.build_flags} -fno-omit-frame-pointer
-D CALIBRATE_TOUCH=0 -D CALIBRATE_TOUCH=0
-D KB_POWERON=10 -D KB_POWERON=10
-D LGFX_DRIVER=LGFX_TDECK -D LGFX_DRIVER=LGFX_TDECK
-D LGFX_DRIVER_INC=\"LGFX_T_DECK.h\"
-D VIEW_320x240 -D VIEW_320x240
-D VIEW_CLASS=TFTView_320x240
-D VIEW_CLASS_INC=\"TFTView_320x240.h\"
; -D USE_DOUBLE_BUFFER ; -D USE_DOUBLE_BUFFER
-D USE_PACKET_API -D USE_PACKET_API
-I lib/device-ui/generated/ui_320x240 -I lib/device-ui/generated/ui_320x240