prevent confusing double #error

MarlinFirmware · Apr 23, 2023 · cdb827d · cdb827d
1 parent 8530fee
commit cdb827d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Marlin/src/pins/gd32f1/pins_SOVOL_V131.h b/Marlin/src/pins/gd32f1/pins_SOVOL_V131.h
@@ -27,8 +27,9 @@
 
 #include "env_validate.h"
 
-#if HOTENDS > 1 || E_STEPPERS > 1
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "SOVOL V131 only supports 1 hotend / E-stepper."
+  #define E_ERROR 1
 #endif
 
 #ifndef BOARD_INFO_NAME
@@ -38,7 +39,6 @@
   #define DEFAULT_MACHINE_NAME "Sovol SV06"
 #endif
 
-
 #include "../stm32f1/pins_CREALITY_V4.h"
 
 #if HAS_TMC_UART

diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h
@@ -25,6 +25,11 @@
  * Creality v2.4.S1 (STM32F103RE / STM32F103RC) v101 as found in the Ender-7
  */
 
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
+  #error "Creality 2.4.S1 V101 only supports 1 hotend / E stepper."
+  #define E_ERROR 1
+#endif
+
 #define BOARD_INFO_NAME      "Creality v2.4.S1 V101"
 #define DEFAULT_MACHINE_NAME "Creality3D"
 

diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h
@@ -30,6 +30,7 @@
 
 #if HAS_MULTI_HOTEND || E_STEPPERS > 1
   #error "Creality v24S1 only supports 1 hotend / E stepper."
+  #define E_ERROR 1
 #endif
 
 #if BOTH(BLTOUCH, Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)

diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -27,7 +27,7 @@
 
 #include "env_validate.h"
 
-#if HAS_MULTI_HOTEND || E_STEPPERS > 1
+#if !E_ERROR && (HAS_MULTI_HOTEND || E_STEPPERS > 1)
   #error "Creality v4 only supports 1 hotend / E stepper."
 #endif
 

diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V425.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V425.h
@@ -27,10 +27,6 @@
 
 #include "env_validate.h"
 
-#if HAS_MULTI_HOTEND || E_STEPPERS > 1
-  #error "Creality v4.2.5 only supports 1 hotend / E stepper."
-#endif
-
 #define BOARD_INFO_NAME "Creality V4.2.5"
 #define DEFAULT_MACHINE_NAME "CR200B"