From 63ced7da7c496241adf3b8f2d5f837c32e8a3eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Fri, 7 Oct 2022 20:28:20 +0200 Subject: [PATCH] use upstream nRF52 toolkit. (TEST) also RTC Lib 1.0.1 is finally out. --- arch/nrf52/nrf52.ini | 4 ++-- variants/m5stack_coreink/platformio.ini | 3 +-- variants/t-echo/platformio.ini | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini index a79ebda48..8e0d2f1b8 100644 --- a/arch/nrf52/nrf52.ini +++ b/arch/nrf52/nrf52.ini @@ -1,7 +1,7 @@ [nrf52_base] ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files -; platform = nordicnrf52 ;pending https://github.com/platformio/builder-framework-arduino-nrf5/pull/7 -platform = https://github.com/meshtastic/platform-nordicnrf52.git#merge +platform = platformio/nordicnrf52@^9.4.0 +; platform = https://github.com/meshtastic/platform-nordicnrf52.git#merge extends = arduino_base build_type = debug ; I'm debugging with ICE a lot now diff --git a/variants/m5stack_coreink/platformio.ini b/variants/m5stack_coreink/platformio.ini index 00c44628d..c33187da0 100644 --- a/variants/m5stack_coreink/platformio.ini +++ b/variants/m5stack_coreink/platformio.ini @@ -12,8 +12,7 @@ build_flags = lib_deps = ${esp32_base.lib_deps} zinggjm/GxEPD2@^1.4.9 -# lewisxhe/PCF8563_Library@^1.0.1 // switch to this one when it is released! - https://github.com/lewisxhe/PCF8563_Library.git#fe8cface109f63b5a4fb6abeaf87c6de0faa24c6 + lewisxhe/PCF8563_Library@^1.0.1 board_build.f_cpu = 240000000L upload_protocol = esptool upload_port = /dev/ttyACM* diff --git a/variants/t-echo/platformio.ini b/variants/t-echo/platformio.ini index 3582f7ed9..201c14657 100644 --- a/variants/t-echo/platformio.ini +++ b/variants/t-echo/platformio.ini @@ -14,6 +14,5 @@ lib_deps = ${nrf52840_base.lib_deps} https://github.com/meshtastic/GxEPD2#afce87a97dda1ac31d8a28dc8fa7c6f55dc96a61 adafruit/Adafruit BusIO@^1.13.2 -# lewisxhe/PCF8563_Library@^1.0.1 // switch to this one when it is released! - https://github.com/lewisxhe/PCF8563_Library.git#fe8cface109f63b5a4fb6abeaf87c6de0faa24c6 + lewisxhe/PCF8563_Library@^1.0.1 ;upload_protocol = fs