From cde228d7f451eb8d86136ce4fb03bf6cff598519 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 13 Dec 2024 13:53:04 +1300
Subject: [PATCH 1/4] add LPC1768_OR_LPC1769

---
 Marlin/src/pins/lpc1768/env_validate.h       | 14 ++++++++------
 Marlin/src/pins/lpc1768/pins_MKS_SBASE.h     |  1 +
 Marlin/src/pins/lpc1769/env_validate.h       |  5 +++--
 Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h |  1 +
 Marlin/src/pins/pins.h                       |  6 +++---
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/env_validate.h b/Marlin/src/pins/lpc1768/env_validate.h
index 8a6a1cebd368..d93b2f514ddd 100644
--- a/Marlin/src/pins/lpc1768/env_validate.h
+++ b/Marlin/src/pins/lpc1768/env_validate.h
@@ -22,12 +22,14 @@
 #ifndef ENV_VALIDATE_H
 #define ENV_VALIDATE_H
 
-#if ENABLED(REQUIRE_LPC1769) && NOT_TARGET(MCU_LPC1769)
-  #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
-#elif DISABLED(REQUIRE_LPC1769) && NOT_TARGET(MCU_LPC1768)
-  #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
+#if DISABLED(REQUIRE_EITHER_LPC1768_OR_LPC1769)
+  #if ENABLED(REQUIRE_LPC1769) && NOT_TARGET(MCU_LPC1769)
+    #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
+  #elif DISABLED(REQUIRE_LPC1769) && NOT_TARGET(MCU_LPC1768)
+    #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
+  #endif
 #endif
 
 #undef REQUIRE_LPC1769
-
-#endif
+#undef REQUIRE_EITHER_LPC1768_OR_LPC1769
+#endif // ENV_VALIDATE_H
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index 6bfc4c3c64ac..24765a91d1f6 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -25,6 +25,7 @@
  * Makerbase MKS SBASE pin assignments
  */
 
+#define REQUIRE_EITHER_LPC1768_OR_LPC1769
 #include "env_validate.h"
 
 #ifndef BOARD_INFO_NAME
diff --git a/Marlin/src/pins/lpc1769/env_validate.h b/Marlin/src/pins/lpc1769/env_validate.h
index 0f62412453a4..1e607f972f5d 100644
--- a/Marlin/src/pins/lpc1769/env_validate.h
+++ b/Marlin/src/pins/lpc1769/env_validate.h
@@ -22,8 +22,9 @@
 #ifndef ENV_VALIDATE_H
 #define ENV_VALIDATE_H
 
-#if NOT_TARGET(MCU_LPC1769)
+#if NOT_TARGET(MCU_LPC1769) && DISABLED(REQUIRE_EITHER_LPC1768_OR_LPC1769)
   #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 #endif
 
-#endif
+#undef REQUIRE_EITHER_LPC1768_OR_LPC1769
+#endif //ENV_VALIDATE_H
diff --git a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
index fd9c1d94fdb6..44bf6d0761f7 100644
--- a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
@@ -26,6 +26,7 @@
  * See https://smoothieware.github.io/Webif-pack/documentation/web/html/smoothieboard.html
  */
 
+#define REQUIRE_EITHER_LPC1768_OR_LPC1769
 #include "env_validate.h"
 
 #define BOARD_INFO_NAME   "Smoothieboard"
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index eb26103380c1..173fe1e8d23d 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -456,9 +456,9 @@
 //
 
 #elif MB(RAMPS_14_RE_ARM_EFB, RAMPS_14_RE_ARM_EEB, RAMPS_14_RE_ARM_EFF, RAMPS_14_RE_ARM_EEF, RAMPS_14_RE_ARM_SF)
-  #include "lpc1768/pins_RAMPS_RE_ARM.h"            // LPC1768                              env:LPC1768
+  #include "lpc1768/pins_RAMPS_RE_ARM.h"            // LPC1768/9                            env:LPC1768 env:LPC1769
 #elif MB(MKS_SBASE)
-  #include "lpc1768/pins_MKS_SBASE.h"               // LPC1768                              env:LPC1768
+  #include "lpc1768/pins_MKS_SBASE.h"               // LPC1768/9                            env:LPC1768 env:LPC1769
 #elif MB(AZSMZ_MINI)
   #include "lpc1768/pins_AZSMZ_MINI.h"              // LPC1768                              env:LPC1768
 #elif MB(BIQU_BQ111_A4)
@@ -497,7 +497,7 @@
 #elif MB(COHESION3D_MINI)
   #include "lpc1769/pins_COHESION3D_MINI.h"         // LPC1769                              env:LPC1769
 #elif MB(SMOOTHIEBOARD)
-  #include "lpc1769/pins_SMOOTHIEBOARD.h"           // LPC1769                              env:LPC1769
+  #include "lpc1769/pins_SMOOTHIEBOARD.h"           // LPC1769                              env:LPC1768 env:LPC1769
 #elif MB(TH3D_EZBOARD)
   #include "lpc1769/pins_TH3D_EZBOARD.h"            // LPC1769                              env:LPC1769
 #elif MB(BTT_SKR_V1_4_TURBO)

From c2978475912f5385ec2e7b7b2f787514ddd554d6 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 13 Dec 2024 14:17:24 +1300
Subject: [PATCH 2/4] revert re-arm typo

---
 Marlin/src/pins/pins.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 173fe1e8d23d..c8a5ae27bbc7 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -456,7 +456,7 @@
 //
 
 #elif MB(RAMPS_14_RE_ARM_EFB, RAMPS_14_RE_ARM_EEB, RAMPS_14_RE_ARM_EFF, RAMPS_14_RE_ARM_EEF, RAMPS_14_RE_ARM_SF)
-  #include "lpc1768/pins_RAMPS_RE_ARM.h"            // LPC1768/9                            env:LPC1768 env:LPC1769
+  #include "lpc1768/pins_RAMPS_RE_ARM.h"            // LPC1768                              env:LPC1768
 #elif MB(MKS_SBASE)
   #include "lpc1768/pins_MKS_SBASE.h"               // LPC1768/9                            env:LPC1768 env:LPC1769
 #elif MB(AZSMZ_MINI)

From 4ef26df52a6486bb06826565c1202e004ab9e9aa Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 13 Dec 2024 14:19:12 +1300
Subject: [PATCH 3/4] update SMOOTHIEBOARD comment

---
 Marlin/src/pins/pins.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index c8a5ae27bbc7..aee437c245eb 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -497,7 +497,7 @@
 #elif MB(COHESION3D_MINI)
   #include "lpc1769/pins_COHESION3D_MINI.h"         // LPC1769                              env:LPC1769
 #elif MB(SMOOTHIEBOARD)
-  #include "lpc1769/pins_SMOOTHIEBOARD.h"           // LPC1769                              env:LPC1768 env:LPC1769
+  #include "lpc1769/pins_SMOOTHIEBOARD.h"           // LPC1768/9                            env:LPC1768 env:LPC1769
 #elif MB(TH3D_EZBOARD)
   #include "lpc1769/pins_TH3D_EZBOARD.h"            // LPC1769                              env:LPC1769
 #elif MB(BTT_SKR_V1_4_TURBO)

From ab42819437eaee9008aa1eee8c6852753347fd54 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 8 Jan 2025 16:17:11 -0600
Subject: [PATCH 4/4] tailored error message

---
 Marlin/src/pins/lpc1768/env_validate.h       | 11 +++++++----
 Marlin/src/pins/lpc1768/pins_MKS_SBASE.h     |  2 +-
 Marlin/src/pins/lpc1769/env_validate.h       |  9 ++++++---
 Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Marlin/src/pins/lpc1768/env_validate.h b/Marlin/src/pins/lpc1768/env_validate.h
index d93b2f514ddd..a1b1dde1285f 100644
--- a/Marlin/src/pins/lpc1768/env_validate.h
+++ b/Marlin/src/pins/lpc1768/env_validate.h
@@ -22,14 +22,17 @@
 #ifndef ENV_VALIDATE_H
 #define ENV_VALIDATE_H
 
-#if DISABLED(REQUIRE_EITHER_LPC1768_OR_LPC1769)
-  #if ENABLED(REQUIRE_LPC1769) && NOT_TARGET(MCU_LPC1769)
+#if NOT_TARGET(MCU_LPC1768, MCU_LPC1769)
+  #if ENABLED(ALLOW_LPC1768_OR_9)
+    #error "Oops! Make sure you have the LPC1768 or LPC1769 environment selected in your IDE."
+  #elif ENABLED(REQUIRE_LPC1769)
     #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
-  #elif DISABLED(REQUIRE_LPC1769) && NOT_TARGET(MCU_LPC1768)
+  #else
     #error "Oops! Make sure you have the LPC1768 environment selected in your IDE."
   #endif
 #endif
 
+#undef ALLOW_LPC1768_OR_9
 #undef REQUIRE_LPC1769
-#undef REQUIRE_EITHER_LPC1768_OR_LPC1769
+
 #endif // ENV_VALIDATE_H
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index 24765a91d1f6..b028d490981d 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -25,7 +25,7 @@
  * Makerbase MKS SBASE pin assignments
  */
 
-#define REQUIRE_EITHER_LPC1768_OR_LPC1769
+#define ALLOW_LPC1768_OR_9
 #include "env_validate.h"
 
 #ifndef BOARD_INFO_NAME
diff --git a/Marlin/src/pins/lpc1769/env_validate.h b/Marlin/src/pins/lpc1769/env_validate.h
index 1e607f972f5d..1c6031a293bf 100644
--- a/Marlin/src/pins/lpc1769/env_validate.h
+++ b/Marlin/src/pins/lpc1769/env_validate.h
@@ -22,9 +22,12 @@
 #ifndef ENV_VALIDATE_H
 #define ENV_VALIDATE_H
 
-#if NOT_TARGET(MCU_LPC1769) && DISABLED(REQUIRE_EITHER_LPC1768_OR_LPC1769)
+#if ENABLED(ALLOW_LPC1768_OR_9) && NOT_TARGET(MCU_LPC1768, MCU_LPC1769)
+  #error "Oops! Make sure you have the LPC1768 or LPC1769 environment selected in your IDE."
+#elif NOT_TARGET(MCU_LPC1769)
   #error "Oops! Make sure you have the LPC1769 environment selected in your IDE."
 #endif
 
-#undef REQUIRE_EITHER_LPC1768_OR_LPC1769
-#endif //ENV_VALIDATE_H
+#undef ALLOW_LPC1768_OR_9
+
+#endif // ENV_VALIDATE_H
diff --git a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
index 44bf6d0761f7..062e572605cb 100644
--- a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
@@ -26,7 +26,7 @@
  * See https://smoothieware.github.io/Webif-pack/documentation/web/html/smoothieboard.html
  */
 
-#define REQUIRE_EITHER_LPC1768_OR_LPC1769
+#define ALLOW_LPC1768_OR_9
 #include "env_validate.h"
 
 #define BOARD_INFO_NAME   "Smoothieboard"