cherry-pick: fix nrf builds (#5172)

* fix nrf builds * fix rp2040 + monteops build * Bump lovyan version --------- Co-authored-by: mverch67 <manuel.verch@gmx.de>
meshtastic · Nov 3, 2024 · 36eda52 · 36eda52
1 parent 4fba098
commit 36eda52
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini
@@ -23,4 +23,5 @@ lib_deps=
   rweather/Crypto@^0.4.0
 
 lib_ignore =
-  BluetoothOTA
+  BluetoothOTA
+  lvgl
diff --git 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}

diff --git 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
+  rweather/Crypto
diff --git 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
+;upload_protocol = jlink