From 5cf47c849b19c8b008619fd43fd69c2486014953 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Wed, 11 Aug 2021 20:01:23 +1200
Subject: [PATCH 1/3] add MOTHERBOARD defined check

---
 Marlin/src/pins/pins.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index b3e16056136f..e0d96d624136 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -37,6 +37,11 @@
 
 #define MAX_E_STEPPERS 8
 
+
+#ifndef MOTHERBOARD
+  #error "#define MOTHERBOARD has not been set in Configuration.h"
+#endif
+
 #if   MB(RAMPS_13_EFB, RAMPS_14_EFB, RAMPS_PLUS_EFB, RAMPS_14_RE_ARM_EFB, RAMPS_SMART_EFB, RAMPS_DUO_EFB, RAMPS4DUE_EFB)
   #define IS_RAMPS_EFB
 #elif MB(RAMPS_13_EEB, RAMPS_14_EEB, RAMPS_PLUS_EEB, RAMPS_14_RE_ARM_EEB, RAMPS_SMART_EEB, RAMPS_DUO_EEB, RAMPS4DUE_EEB)
@@ -763,7 +768,7 @@
     #error "BOARD_RAMPS_LONGER3D_LK4PRO is now BOARD_LONGER3D_LKx_PRO. Please update your configuration."
   #elif MB(BTT_SKR_V2_0)
     #error "BTT_SKR_V2_0 is now BTT_SKR_V2_0_REV_A or BTT_SKR_V2_0_REV_B. See https://bit.ly/3t5d9JQ for more information. Please update your configuration."
-  #else
+  #elif defined(MOTHERBOARD)
     #error "Unknown MOTHERBOARD value set in Configuration.h"
   #endif
 

From 8f738c8aa4e17ad9fd8a855ec0b5a56793b9595a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 11 Aug 2021 18:01:39 -0500
Subject: [PATCH 2/3] move to MB error block

---
 Marlin/src/pins/pins.h | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index e0d96d624136..15787a449544 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -37,11 +37,6 @@
 
 #define MAX_E_STEPPERS 8
 
-
-#ifndef MOTHERBOARD
-  #error "#define MOTHERBOARD has not been set in Configuration.h"
-#endif
-
 #if   MB(RAMPS_13_EFB, RAMPS_14_EFB, RAMPS_PLUS_EFB, RAMPS_14_RE_ARM_EFB, RAMPS_SMART_EFB, RAMPS_DUO_EFB, RAMPS4DUE_EFB)
   #define IS_RAMPS_EFB
 #elif MB(RAMPS_13_EEB, RAMPS_14_EEB, RAMPS_PLUS_EEB, RAMPS_14_RE_ARM_EEB, RAMPS_SMART_EEB, RAMPS_DUO_EEB, RAMPS4DUE_EEB)
@@ -720,7 +715,9 @@
   #define BOARD_RAMPS_LONGER3D_LK4PRO   -1021
   #define BOARD_BTT_SKR_V2_0            -1022
 
-  #if MB(MKS_13)
+  #ifndef MOTHERBOARD
+    #error "MOTHERBOARD not defined! Use '#define MOTHERBOARD BOARD_...' in Configuration.h."
+  #elif MB(MKS_13)
     #error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
   #elif MB(TRIGORILLA)
     #error "BOARD_TRIGORILLA has been renamed BOARD_TRIGORILLA_13. Please update your configuration."
@@ -768,7 +765,7 @@
     #error "BOARD_RAMPS_LONGER3D_LK4PRO is now BOARD_LONGER3D_LKx_PRO. Please update your configuration."
   #elif MB(BTT_SKR_V2_0)
     #error "BTT_SKR_V2_0 is now BTT_SKR_V2_0_REV_A or BTT_SKR_V2_0_REV_B. See https://bit.ly/3t5d9JQ for more information. Please update your configuration."
-  #elif defined(MOTHERBOARD)
+  #else
     #error "Unknown MOTHERBOARD value set in Configuration.h"
   #endif
 

From dbc8155d1f2a7cb6473a63f67f7aa249c40963a4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Wed, 11 Aug 2021 18:03:27 -0500
Subject: [PATCH 3/3] Update pins.h

---
 Marlin/src/pins/pins.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 15787a449544..b683f19c8a19 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -715,9 +715,7 @@
   #define BOARD_RAMPS_LONGER3D_LK4PRO   -1021
   #define BOARD_BTT_SKR_V2_0            -1022
 
-  #ifndef MOTHERBOARD
-    #error "MOTHERBOARD not defined! Use '#define MOTHERBOARD BOARD_...' in Configuration.h."
-  #elif MB(MKS_13)
+  #if MB(MKS_13)
     #error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
   #elif MB(TRIGORILLA)
     #error "BOARD_TRIGORILLA has been renamed BOARD_TRIGORILLA_13. Please update your configuration."
@@ -765,8 +763,10 @@
     #error "BOARD_RAMPS_LONGER3D_LK4PRO is now BOARD_LONGER3D_LKx_PRO. Please update your configuration."
   #elif MB(BTT_SKR_V2_0)
     #error "BTT_SKR_V2_0 is now BTT_SKR_V2_0_REV_A or BTT_SKR_V2_0_REV_B. See https://bit.ly/3t5d9JQ for more information. Please update your configuration."
+  #elif defined(MOTHERBOARD)
+    #error "Unknown MOTHERBOARD value set in Configuration.h."
   #else
-    #error "Unknown MOTHERBOARD value set in Configuration.h"
+    #error "MOTHERBOARD not defined! Use '#define MOTHERBOARD BOARD_...' in Configuration.h."
   #endif
 
   #undef BOARD_MKS_13