Browse Source

🔧 Fix E.S.T. sanity-check errors (#22224)

ellensp 3 years ago
parent
commit
7328a6e3a7
No account linked to committer's email address
1 changed files with 17 additions and 12 deletions
  1. 17
    12
      Marlin/src/inc/SanityCheck.h

+ 17
- 12
Marlin/src/inc/SanityCheck.h View File

@@ -1249,23 +1249,28 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
1249 1249
 #endif
1250 1250
 
1251 1251
 /**
1252
- * (Electro)magnetic Switching Toolhead requirements
1252
+ * Magnetic / Electromagnetic Switching Toolhead requirements
1253 1253
  */
1254 1254
 #if EITHER(MAGNETIC_SWITCHING_TOOLHEAD, ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
1255 1255
   #ifndef SWITCHING_TOOLHEAD_Y_POS
1256
-    #error "(ELECTRO)MAGNETIC_SWITCHING_TOOLHEAD requires SWITCHING_TOOLHEAD_Y_POS"
1256
+    #error "(ELECTRO)?MAGNETIC_SWITCHING_TOOLHEAD requires SWITCHING_TOOLHEAD_Y_POS"
1257 1257
   #elif !defined(SWITCHING_TOOLHEAD_X_POS)
1258
-    #error "(ELECTRO)MAGNETIC_SWITCHING_TOOLHEAD requires SWITCHING_TOOLHEAD_X_POS"
1259
-  #elif !defined(SWITCHING_TOOLHEAD_Z_HOP)
1260
-    #error "(ELECTRO)MAGNETIC_SWITCHING_TOOLHEAD requires SWITCHING_TOOLHEAD_Z_HOP."
1258
+    #error "(ELECTRO)?MAGNETIC_SWITCHING_TOOLHEAD requires SWITCHING_TOOLHEAD_X_POS"
1261 1259
   #elif !defined(SWITCHING_TOOLHEAD_Y_CLEAR)
1262
-    #error "(ELECTRO)MAGNETIC_SWITCHING_TOOLHEAD requires SWITCHING_TOOLHEAD_Y_CLEAR."
1263
-  #elif ENABLED(ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
1264
-    #if ENABLED(EXT_SOLENOID)
1265
-      #error "(ELECTRO)MAGNETIC_SWITCHING_TOOLHEAD and EXT_SOLENOID are incompatible. (Pins are used twice.)"
1266
-    #elif !PIN_EXISTS(SOL0)
1267
-      #error "(ELECTRO)MAGNETIC_SWITCHING_TOOLHEAD requires SOL0_PIN."
1268
-    #endif
1260
+    #error "(ELECTRO)?MAGNETIC_SWITCHING_TOOLHEAD requires SWITCHING_TOOLHEAD_Y_CLEAR."
1261
+  #endif
1262
+#endif
1263
+
1264
+/**
1265
+ * Electromagnetic Switching Toolhead requirements
1266
+ */
1267
+#if ENABLED(ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
1268
+  #if ENABLED(EXT_SOLENOID)
1269
+    #error "ELECTROMAGNETIC_SWITCHING_TOOLHEAD and EXT_SOLENOID are incompatible. (Pins are used twice.)"
1270
+  #elif !PIN_EXISTS(SOL0)
1271
+    #error "ELECTROMAGNETIC_SWITCHING_TOOLHEAD requires SOL0_PIN."
1272
+  #elif !defined(SWITCHING_TOOLHEAD_Z_HOP)
1273
+    #error "ELECTROMAGNETIC_SWITCHING_TOOLHEAD requires SWITCHING_TOOLHEAD_Z_HOP."
1269 1274
   #endif
1270 1275
 #endif
1271 1276
 

Loading…
Cancel
Save