Merge branch 'master' into tft-gui-work

2025-02-26 22:33:24 +00:00 · 2024-10-28 09:33:20 +01:00 · 2024-10-28 09:33:20 +01:00 · b4c3dfb190
commit b4c3dfb190
parent 402d14d34a 195f109ef7
3 changed files with 4 additions and 3 deletions
--- 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
--- a/src/main.cpp
+++ b/src/main.cpp
@ -1323,4 +1323,4 @@ void tft_task_handler(void *param = nullptr)
    }
 }

-#endif
+#endif
--- 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