From 854a8dfe2fb2363fe10d01a399a4d9b1a9aaf506 Mon Sep 17 00:00:00 2001
From: recrof <recrof@gmail.com>
Date: Sat, 12 Jul 2025 20:06:56 +0200
Subject: [PATCH] move rak to nrf52_core, remove nrf52840_core

---
 platformio.ini                  |  8 --------
 variants/rak4631/platformio.ini | 10 +++++-----
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index d20508a89..00a2d0fb6 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -77,14 +77,6 @@ build_flags = ${arduino_base.build_flags}
   -D NRF52_PLATFORM
   -D LFS_NO_ASSERT=1
 
-[nrf52840_base]
-extends = nrf52_base
-build_flags = ${nrf52_base.build_flags}
-lib_deps =
-  ${nrf52_base.lib_deps}
-  rweather/Crypto @ ^0.4.0
-  https://github.com/adafruit/Adafruit_nRF52_Arduino
-
 ; ----------------- RP2040 ---------------------
 
 [rp2040_base]
diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini
index 5fcdb3d0d..d4f8028b4 100644
--- a/variants/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@@ -1,9 +1,9 @@
 [rak4631]
-extends = nrf52840_base
+extends = nrf52_base
 platform = https://github.com/maxgerhardt/platform-nordicnrf52.git#rak
 board = wiscore_rak4631
 board_check = true
-build_flags = ${nrf52840_base.build_flags}
+build_flags = ${nrf52_base.build_flags}
   -I variants/rak4631
   -D RAK_4631
   -D PIN_BOARD_SCL=14
@@ -14,10 +14,10 @@ build_flags = ${nrf52840_base.build_flags}
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
-build_src_filter = ${nrf52840_base.build_src_filter}
+build_src_filter = ${nrf52_base.build_src_filter}
   +<../variants/rak4631>
 lib_deps =
-  ${nrf52840_base.lib_deps}
+  ${nrf52_base.lib_deps}
   adafruit/Adafruit SSD1306 @ ^2.5.13
   stevemarple/MicroNMEA @ ^2.0.6
 
@@ -55,7 +55,7 @@ build_flags =
 build_src_filter = ${rak4631.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
   +<../examples/simple_repeater>
-lib_deps = 
+lib_deps =
   ${rak4631.lib_deps}
   sparkfun/SparkFun u-blox GNSS Arduino Library @ ^2.2.27
   https://github.com/boschsensortec/Bosch-BSEC2-Library