From a794219b5cebee1835559a6b782624fc25da8c77 Mon Sep 17 00:00:00 2001
From: Joe Campbell <10763991+needs-coffee@users.noreply.github.com>
Date: Fri, 18 Oct 2024 00:43:22 +0100
Subject: [PATCH] Avoid custom MCU definition being redefined as NRF52832

---
 cores/nRF5/SDK/components/device/nrf.h | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/cores/nRF5/SDK/components/device/nrf.h b/cores/nRF5/SDK/components/device/nrf.h
index 63087ce7..40bed10c 100755
--- a/cores/nRF5/SDK/components/device/nrf.h
+++ b/cores/nRF5/SDK/components/device/nrf.h
@@ -90,9 +90,19 @@ POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 /* Redefine "old" too-generic name NRF52 to NRF52832_XXAA to keep backwards compatibility. */
-#if defined (NRF52)
-    #ifndef NRF52832_XXAA
-        #define NRF52832_XXAA
+/* only do this if a specific MCU part is not defined to avoid redefining as NRF52832_XXAA */
+#if !defined(NRF52805_XXAA) &&\
+    !defined(NRF52810_XXAA) &&\
+    !defined(NRF52811_XXAA) &&\
+    !defined(NRF52820_XXAA) &&\
+    !defined(NRF52832_XXAA) &&\
+    !defined(NRF52832_XXAB) &&\
+    !defined(NRF52833_XXAA) &&\
+    !defined(NRF52840_XXAA)
+    #if defined (NRF52)
+        #ifndef NRF52832_XXAA
+            #define NRF52832_XXAA
+        #endif
     #endif
 #endif