From e2ee039e714646ce47916d4ceaec7c313a04dead Mon Sep 17 00:00:00 2001 From: mverch67 Date: Tue, 5 Mar 2024 16:42:52 +0100 Subject: [PATCH 1/3] fix nrf builds --- arch/nrf52/nrf52.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini index 04880d540e..1af68198bf 100644 --- a/arch/nrf52/nrf52.ini +++ b/arch/nrf52/nrf52.ini @@ -23,4 +23,5 @@ lib_deps= rweather/Crypto@^0.4.0 lib_ignore = - BluetoothOTA \ No newline at end of file + BluetoothOTA + lvgl From 89d8039eff8d2ffafb885e1f276ec3d9e413d5a0 Mon Sep 17 00:00:00 2001 From: mverch67 Date: Tue, 5 Mar 2024 18:02:08 +0100 Subject: [PATCH 2/3] fix rp2040 + monteops build --- arch/rp2xx0/rp2350.ini | 3 ++- variants/monteops_hw1/platformio.ini | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/rp2xx0/rp2350.ini b/arch/rp2xx0/rp2350.ini index 96ed0cb217..7ef6332e32 100644 --- a/arch/rp2xx0/rp2350.ini +++ b/arch/rp2xx0/rp2350.ini @@ -16,8 +16,9 @@ build_src_filter = lib_ignore = BluetoothOTA + lvgl lib_deps = ${arduino_base.lib_deps} ${environmental_base.lib_deps} - rweather/Crypto \ No newline at end of file + rweather/Crypto diff --git a/variants/monteops_hw1/platformio.ini b/variants/monteops_hw1/platformio.ini index 4b42dce397..eaa246526a 100644 --- a/variants/monteops_hw1/platformio.ini +++ b/variants/monteops_hw1/platformio.ini @@ -12,4 +12,4 @@ lib_deps = https://github.com/RAKWireless/RAK13800-W5100S.git#1.0.2 debug_tool = jlink ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm) -;upload_protocol = jlink \ No newline at end of file +;upload_protocol = jlink From e54e97ec9c9c0e5261dfed932a91db77083fcf5a Mon Sep 17 00:00:00 2001 From: Tom Fifield Date: Mon, 28 Oct 2024 11:11:41 +1000 Subject: [PATCH 3/3] Bump lovyan version --- arch/portduino/portduino.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini index 8778c32a0d..7eb563d771 100644 --- a/arch/portduino/portduino.ini +++ b/arch/portduino/portduino.ini @@ -24,7 +24,7 @@ lib_deps = ${env.lib_deps} ${networking_base.lib_deps} rweather/Crypto@^0.4.0 - lovyan03/LovyanGFX@^1.1.16 + https://github.com/lovyan03/LovyanGFX.git#1401c28a47646fe00538d487adcb2eb3c72de805 build_flags = ${arduino_base.build_flags}