Improve STEVAL_3DP001V1 and future STEVAL_* support (#16404)

MarlinFirmware · Jan 2, 2020 · 747b2b9 · 747b2b9
1 parent 23bdc15
commit 747b2b9
Show file tree

Hide file tree

Showing 13 changed files with 1,803 additions and 192 deletions.
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
@@ -303,7 +303,7 @@
 #define BOARD_RUMBA32                 4203  // RUMBA32 STM32F4-based controller
 #define BOARD_BLACK_STM32F407VE       4204  // BLACK_STM32F407VE
 #define BOARD_BLACK_STM32F407ZE       4205  // BLACK_STM32F407ZE
-#define BOARD_STEVAL                  4206  // STEVAL-3DP001V1 3D PRINTER BOARD
+#define BOARD_STEVAL_3DP001V1         4206  // STEVAL-3DP001V1 3D PRINTER BOARD
 #define BOARD_BIGTREE_SKR_PRO_V1_1    4207  // BigTreeTech SKR Pro v1.1 (STM32F407ZG)
 #define BOARD_BIGTREE_BTT002_V1_0     4208  // BigTreeTech BTT002 v1.0 (STM32F407VE)
 #define BOARD_LERDGE_K                4209  // Lerdge K (STM32F407ZG)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
@@ -426,44 +426,6 @@
   #error "HOME_USING_SPREADCYCLE is now obsolete. Please remove it from Configuration_adv.h."
 #endif
 
-#define BOARD_MKS_13        -1000
-#define BOARD_TRIGORILLA    -1001
-#define BOARD_RURAMPS4D     -1002
-#define BOARD_FORMBOT_TREX2 -1003
-#define BOARD_BIQU_SKR_V1_1 -1004
-#define BOARD_STM32F1R      -1005
-#define BOARD_STM32F103R    -1006
-#define BOARD_ESP32         -1007
-#define BOARD_BIGTREE_SKR_MINI_E3 -1008
-#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."
-#elif MB(RURAMPS4D)
-  #error "BOARD_RURAMPS4D has been renamed BOARD_RURAMPS4D_11. Please update your configuration."
-#elif MB(FORMBOT_TREX2)
-  #error "FORMBOT_TREX2 has been renamed BOARD_FORMBOT_TREX2PLUS. Please update your configuration."
-#elif MB(BIQU_SKR_V1_1)
-  #error "BOARD_BIQU_SKR_V1_1 has been renamed BOARD_BIGTREE_SKR_V1_1. Please update your configuration."
-#elif MB(STM32F1R)
-  #error "BOARD_STM32F1R has been renamed BOARD_STM32F103RE. Please update your configuration."
-#elif MB(STM32F103R)
-  #error "BOARD_STM32F103R has been renamed BOARD_STM32F103RE. Please update your configuration."
-#elif MOTHERBOARD == BOARD_ESP32
-  #error "BOARD_ESP32 has been renamed BOARD_ESPRESSIF_ESP32. Please update your configuration."
-#elif MOTHERBOARD == BOARD_BIGTREE_SKR_MINI_E3
-  #error "BOARD_BIGTREE_SKR_MINI_E3 has been renamed BOARD_BTT_SKR_MINI_E3_V1_0. Please update your configuration."
-#endif
-#undef BOARD_MKS_13
-#undef BOARD_TRIGORILLA
-#undef BOARD_RURAMPS4D
-#undef BOARD_FORMBOT_TREX2
-#undef BOARD_BIQU_SKR_V1_1
-#undef BOARD_STM32F1R
-#undef BOARD_STM32F103R
-#undef BOARD_ESP32
-#undef BOARD_BIGTREE_SKR_MINI_E3
-
 /**
  * Marlin release, version and default string
  */

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
@@ -523,8 +523,8 @@
   #include "stm32/pins_RUMBA32.h"               // STM32F4                                env:RUMBA32
 #elif MB(BLACK_STM32F407VE)
   #include "stm32/pins_BLACK_STM32F407VE.h"     // STM32F4                                env:STM32F407VE_black
-#elif MB(STEVAL)
-  #include "stm32/pins_STEVAL.h"                // STM32F4                                env:STM32F4
+#elif MB(STEVAL_3DP001V1)
+  #include "stm32/pins_STEVAL_3DP001V1.h"       // STM32F4                                env:STM32F401VE_STEVAL
 #elif MB(BIGTREE_SKR_PRO_V1_1)
   #include "stm32/pins_BTT_SKR_PRO_V1_1.h"      // STM32F4                                env:BIGTREE_SKR_PRO
 #elif MB(BIGTREE_BTT002_V1_0)
@@ -571,7 +571,57 @@
   #include "linux/pins_RAMPS_LINUX.h"           // Linux                                  env:linux_native
 
 #else
-  #error "Unknown MOTHERBOARD value set in Configuration.h"
+
+  //
+  // Obsolete or unknown board
+  //
+
+  #define BOARD_MKS_13        -1000
+  #define BOARD_TRIGORILLA    -1001
+  #define BOARD_RURAMPS4D     -1002
+  #define BOARD_FORMBOT_TREX2 -1003
+  #define BOARD_BIQU_SKR_V1_1 -1004
+  #define BOARD_STM32F1R      -1005
+  #define BOARD_STM32F103R    -1006
+  #define BOARD_ESP32         -1007
+  #define BOARD_BIGTREE_SKR_MINI_E3 -1008
+  #define BOARD_STEVAL        -1009
+
+  #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."
+  #elif MB(RURAMPS4D)
+    #error "BOARD_RURAMPS4D has been renamed BOARD_RURAMPS4D_11. Please update your configuration."
+  #elif MB(FORMBOT_TREX2)
+    #error "FORMBOT_TREX2 has been renamed BOARD_FORMBOT_TREX2PLUS. Please update your configuration."
+  #elif MB(BIQU_SKR_V1_1)
+    #error "BOARD_BIQU_SKR_V1_1 has been renamed BOARD_BIGTREE_SKR_V1_1. Please update your configuration."
+  #elif MB(STM32F1R)
+    #error "BOARD_STM32F1R has been renamed BOARD_STM32F103RE. Please update your configuration."
+  #elif MB(STM32F103R)
+    #error "BOARD_STM32F103R has been renamed BOARD_STM32F103RE. Please update your configuration."
+  #elif MOTHERBOARD == BOARD_ESP32
+    #error "BOARD_ESP32 has been renamed BOARD_ESPRESSIF_ESP32. Please update your configuration."
+  #elif MB(BIGTREE_SKR_MINI_E3)
+    #error "BOARD_BIGTREE_SKR_MINI_E3 has been renamed BOARD_BTT_SKR_MINI_E3_V1_0. Please update your configuration."
+  #elif MB(STEVAL)
+    #error "BOARD_STEVAL has been renamed BOARD_STEVAL_3DP001V1. Please update your configuration."
+  #else
+    #error "Unknown MOTHERBOARD value set in Configuration.h"
+  #endif
+
+  #undef BOARD_MKS_13
+  #undef BOARD_TRIGORILLA
+  #undef BOARD_RURAMPS4D
+  #undef BOARD_FORMBOT_TREX2
+  #undef BOARD_BIQU_SKR_V1_1
+  #undef BOARD_STM32F1R
+  #undef BOARD_STM32F103R
+  #undef BOARD_ESP32
+  #undef BOARD_BIGTREE_SKR_MINI_E3
+  #undef BOARD_STEVAL
+
 #endif
 
 // Define certain undefined pins

diff --git a/Marlin/src/pins/stm32/pins_STEVAL.h b/Marlin/src/pins/stm32/pins_STEVAL.h