From d83838d7d714fd8a406ea8ba6798698063acf9f0 Mon Sep 17 00:00:00 2001 From: mverch67 Date: Mon, 15 Apr 2024 14:59:12 +0200 Subject: [PATCH] update platform definitions to refactored lib --- variants/portduino/platformio.ini | 10 ++++++---- variants/t-deck/platformio.ini | 3 --- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/variants/portduino/platformio.ini b/variants/portduino/platformio.ini index c2d171561..3e96f41c7 100644 --- a/variants/portduino/platformio.ini +++ b/variants/portduino/platformio.ini @@ -7,7 +7,8 @@ build_flags = ${portduino_base.build_flags} -O0 -I variants/portduino -I /usr/in !pkg-config --libs openssl --silence-errors || : board = cross_platform 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} [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 || : board = cross_platform 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} - +<../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_SCREEN=0 -D VIEW_320x240 - -D VIEW_CLASS=TFTView_320x240 - -D VIEW_CLASS_INC=\"TFTView_320x240.h\" -D DISP_HOR_RES=320 -D DISP_VER_RES=240 -D LV_BUILD_TEST=0 @@ -67,9 +67,11 @@ board = cross_platform lib_deps = ${portduino_base.lib_deps} ; x11 is currently only supported in master branch, not in 6.1.1 https://github.com/lvgl/lv_drivers.git#110089d7f4be4df34aa7efc17c8cdd911e562846 + https://github.com/lovyan03/LovyanGFX.git#a0e0d14df3f6d24e589b77adb524cc3a75dbf8fa 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> + + diff --git a/variants/t-deck/platformio.ini b/variants/t-deck/platformio.ini index 7f571adb3..b58cccb47 100644 --- a/variants/t-deck/platformio.ini +++ b/variants/t-deck/platformio.ini @@ -19,10 +19,7 @@ build_flags = ${esp32_base.build_flags} -fno-omit-frame-pointer -D CALIBRATE_TOUCH=0 -D KB_POWERON=10 -D LGFX_DRIVER=LGFX_TDECK - -D LGFX_DRIVER_INC=\"LGFX_T_DECK.h\" -D VIEW_320x240 - -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