🏗️ Support for up to 6 linear axes (#19112)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>

Marlin/src/pins/pinsDebug_list.h

@@ -1319,6 +1319,105 @@
 #if PIN_EXISTS(Z_MIN_PROBE)
   REPORT_NAME_DIGITAL(__LINE__, Z_MIN_PROBE_PIN)
 #endif
+#if PIN_EXISTS(I_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, I_ATT_PIN)
+#endif
+#if PIN_EXISTS(I_CS)
+  REPORT_NAME_DIGITAL(__LINE__, I_CS_PIN)
+#endif
+#if PIN_EXISTS(I_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, I_DIR_PIN)
+#endif
+#if PIN_EXISTS(I_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, I_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(I_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, I_MAX_PIN)
+#endif
+#if PIN_EXISTS(I_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, I_MIN_PIN)
+#endif
+#if PIN_EXISTS(I_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, I_MS1_PIN)
+#endif
+#if PIN_EXISTS(I_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, I_MS2_PIN)
+#endif
+#if PIN_EXISTS(I_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, I_MS3_PIN)
+#endif
+#if PIN_EXISTS(I_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, I_STEP_PIN)
+#endif
+#if PIN_EXISTS(I_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, I_STOP_PIN)
+#endif
+#if PIN_EXISTS(J_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, J_ATT_PIN)
+#endif
+#if PIN_EXISTS(J_CS)
+  REPORT_NAME_DIGITAL(__LINE__, J_CS_PIN)
+#endif
+#if PIN_EXISTS(J_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, J_DIR_PIN)
+#endif
+#if PIN_EXISTS(J_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, J_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(J_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, J_MAX_PIN)
+#endif
+#if PIN_EXISTS(J_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, J_MIN_PIN)
+#endif
+#if PIN_EXISTS(J_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, J_MS1_PIN)
+#endif
+#if PIN_EXISTS(J_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, J_MS2_PIN)
+#endif
+#if PIN_EXISTS(J_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, J_MS3_PIN)
+#endif
+#if PIN_EXISTS(J_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, J_STEP_PIN)
+#endif
+#if PIN_EXISTS(J_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, J_STOP_PIN)
+#endif
+#if PIN_EXISTS(K_ATT)
+  REPORT_NAME_DIGITAL(__LINE__, K_ATT_PIN)
+#endif
+#if PIN_EXISTS(K_CS)
+  REPORT_NAME_DIGITAL(__LINE__, K_CS_PIN)
+#endif
+#if PIN_EXISTS(K_DIR)
+  REPORT_NAME_DIGITAL(__LINE__, K_DIR_PIN)
+#endif
+#if PIN_EXISTS(K_ENABLE)
+  REPORT_NAME_DIGITAL(__LINE__, K_ENABLE_PIN)
+#endif
+#if PIN_EXISTS(K_MAX)
+  REPORT_NAME_DIGITAL(__LINE__, K_MAX_PIN)
+#endif
+#if PIN_EXISTS(K_MIN)
+  REPORT_NAME_DIGITAL(__LINE__, K_MIN_PIN)
+#endif
+#if PIN_EXISTS(K_MS1)
+  REPORT_NAME_DIGITAL(__LINE__, K_MS1_PIN)
+#endif
+#if PIN_EXISTS(K_MS2)
+  REPORT_NAME_DIGITAL(__LINE__, K_MS2_PIN)
+#endif
+#if PIN_EXISTS(K_MS3)
+  REPORT_NAME_DIGITAL(__LINE__, K_MS3_PIN)
+#endif
+#if PIN_EXISTS(K_STEP)
+  REPORT_NAME_DIGITAL(__LINE__, K_STEP_PIN)
+#endif
+#if PIN_EXISTS(K_STOP)
+  REPORT_NAME_DIGITAL(__LINE__, K_STOP_PIN)
+#endif
 #if PIN_EXISTS(ZRIB_V20_D6)
   REPORT_NAME_DIGITAL(__LINE__, ZRIB_V20_D6_PIN)
 #endif

Marlin/src/pins/pins_postprocess.h

@@ -402,40 +402,89 @@
   #define X_STOP_PIN X_MAX_PIN
 #endif
 
-#ifdef Y_STOP_PIN
-  #if Y_HOME_TO_MIN
-    #define Y_MIN_PIN Y_STOP_PIN
-    #ifndef Y_MAX_PIN
-      #define Y_MAX_PIN -1
+#if HAS_Y_AXIS
+  #ifdef Y_STOP_PIN
+    #if Y_HOME_TO_MIN
+      #define Y_MIN_PIN Y_STOP_PIN
+      #ifndef Y_MAX_PIN
+        #define Y_MAX_PIN -1
+      #endif
+    #else
+      #define Y_MAX_PIN Y_STOP_PIN
+      #ifndef Y_MIN_PIN
+        #define Y_MIN_PIN -1
+      #endif
     #endif
+  #elif Y_HOME_TO_MIN
+    #define Y_STOP_PIN Y_MIN_PIN
   #else
-    #define Y_MAX_PIN Y_STOP_PIN
-    #ifndef Y_MIN_PIN
-      #define Y_MIN_PIN -1
-    #endif
+    #define Y_STOP_PIN Y_MAX_PIN
   #endif
-#elif Y_HOME_TO_MIN
-  #define Y_STOP_PIN Y_MIN_PIN
-#else
-  #define Y_STOP_PIN Y_MAX_PIN
 #endif
 
-#ifdef Z_STOP_PIN
-  #if Z_HOME_TO_MIN
-    #define Z_MIN_PIN Z_STOP_PIN
-    #ifndef Z_MAX_PIN
-      #define Z_MAX_PIN -1
+#if HAS_Z_AXIS
+  #ifdef Z_STOP_PIN
+    #if Z_HOME_TO_MIN
+      #define Z_MIN_PIN Z_STOP_PIN
+      #ifndef Z_MAX_PIN
+        #define Z_MAX_PIN -1
+      #endif
+    #else
+      #define Z_MAX_PIN Z_STOP_PIN
+      #ifndef Z_MIN_PIN
+        #define Z_MIN_PIN -1
+      #endif
     #endif
+  #elif Z_HOME_TO_MIN
+    #define Z_STOP_PIN Z_MIN_PIN
   #else
-    #define Z_MAX_PIN Z_STOP_PIN
-    #ifndef Z_MIN_PIN
-      #define Z_MIN_PIN -1
+    #define Z_STOP_PIN Z_MAX_PIN
+  #endif
+#endif
+
+#if LINEAR_AXES >= 4
+  #ifdef I_STOP_PIN
+    #if I_HOME_TO_MIN
+      #define I_MIN_PIN I_STOP_PIN
+      #define I_MAX_PIN -1
+    #else
+      #define I_MIN_PIN -1
+      #define I_MAX_PIN I_STOP_PIN
     #endif
   #endif
-#elif Z_HOME_TO_MIN
-  #define Z_STOP_PIN Z_MIN_PIN
 #else
-  #define Z_STOP_PIN Z_MAX_PIN
+  #undef I_MIN_PIN
+  #undef I_MAX_PIN
+#endif
+
+#if LINEAR_AXES >= 5
+  #ifdef J_STOP_PIN
+    #if J_HOME_TO_MIN
+      #define J_MIN_PIN J_STOP_PIN
+      #define J_MAX_PIN -1
+    #else
+      #define J_MIN_PIN -1
+      #define J_MAX_PIN J_STOP_PIN
+    #endif
+  #endif
+#else
+  #undef J_MIN_PIN
+  #undef J_MAX_PIN
+#endif
+
+#if LINEAR_AXES >= 6
+  #ifdef K_STOP_PIN
+    #if K_HOME_TO_MIN
+      #define K_MIN_PIN K_STOP_PIN
+      #define K_MAX_PIN -1
+    #else
+      #define K_MIN_PIN -1
+      #define K_MAX_PIN K_STOP_PIN
+    #endif
+  #endif
+#else
+  #undef K_MIN_PIN
+  #undef K_MAX_PIN
 #endif
 
 // Filament Sensor first pin alias
@@ -863,6 +912,19 @@
   #undef Z_MAX_PIN
   #define Z_MAX_PIN          -1
 #endif
+#if DISABLED(USE_IMAX_PLUG)
+  #undef I_MAX_PIN
+  #define I_MAX_PIN          -1
+#endif
+#if DISABLED(USE_JMAX_PLUG)
+  #undef J_MAX_PIN
+  #define J_MAX_PIN          -1
+#endif
+#if DISABLED(USE_KMAX_PLUG)
+  #undef K_MAX_PIN
+  #define K_MAX_PIN          -1
+#endif
+
 #if DISABLED(USE_XMIN_PLUG)
   #undef X_MIN_PIN
   #define X_MIN_PIN          -1
@@ -906,6 +968,19 @@
   #undef Z4_MAX_PIN
 #endif
 
+#if DISABLED(USE_IMIN_PLUG)
+  #undef I_MIN_PIN
+  #define I_MIN_PIN          -1
+#endif
+#if DISABLED(USE_JMIN_PLUG)
+  #undef J_MIN_PIN
+  #define J_MIN_PIN          -1
+#endif
+#if DISABLED(USE_KMIN_PLUG)
+  #undef K_MIN_PIN
+  #define K_MIN_PIN          -1
+#endif
+
 //
 // Default DOGLCD SPI delays
 //

Marlin/src/pins/sensitive_pins.h

@@ -63,81 +63,220 @@
 
 #define _X_PINS X_STEP_PIN, X_DIR_PIN, _X_ENABLE_PIN _X_MIN _X_MAX _X_MS1 _X_MS2 _X_MS3 _X_CS
 
-#if PIN_EXISTS(Y_MIN)
-  #define _Y_MIN Y_MIN_PIN,
+#if HAS_Y_AXIS
+
+  #if PIN_EXISTS(Y_MIN)
+    #define _Y_MIN Y_MIN_PIN,
+  #else
+    #define _Y_MIN
+  #endif
+  #if PIN_EXISTS(Y_MAX)
+    #define _Y_MAX Y_MAX_PIN,
+  #else
+    #define _Y_MAX
+  #endif
+  #if PIN_EXISTS(Y_CS) && AXIS_HAS_SPI(Y)
+    #define _Y_CS Y_CS_PIN,
+  #else
+    #define _Y_CS
+  #endif
+  #if PIN_EXISTS(Y_MS1)
+    #define _Y_MS1 Y_MS1_PIN,
+  #else
+    #define _Y_MS1
+  #endif
+  #if PIN_EXISTS(Y_MS2)
+    #define _Y_MS2 Y_MS2_PIN,
+  #else
+    #define _Y_MS2
+  #endif
+  #if PIN_EXISTS(Y_MS3)
+    #define _Y_MS3 Y_MS3_PIN,
+  #else
+    #define _Y_MS3
+  #endif
+  #if PIN_EXISTS(Y_ENABLE)
+    #define _Y_ENABLE_PIN Y_ENABLE_PIN,
+  #else
+    #define _Y_ENABLE_PIN
+  #endif
+
+  #define _Y_PINS Y_STEP_PIN, Y_DIR_PIN, _Y_ENABLE_PIN _Y_MIN _Y_MAX _Y_MS1 _Y_MS2 _Y_MS3 _Y_CS
+
 #else
-  #define _Y_MIN
-#endif
-#if PIN_EXISTS(Y_MAX)
-  #define _Y_MAX Y_MAX_PIN,
-#else
-  #define _Y_MAX
-#endif
-#if PIN_EXISTS(Y_CS) && AXIS_HAS_SPI(Y)
-  #define _Y_CS Y_CS_PIN,
-#else
-  #define _Y_CS
-#endif
-#if PIN_EXISTS(Y_MS1)
-  #define _Y_MS1 Y_MS1_PIN,
-#else
-  #define _Y_MS1
-#endif
-#if PIN_EXISTS(Y_MS2)
-  #define _Y_MS2 Y_MS2_PIN,
-#else
-  #define _Y_MS2
-#endif
-#if PIN_EXISTS(Y_MS3)
-  #define _Y_MS3 Y_MS3_PIN,
-#else
-  #define _Y_MS3
-#endif
-#if PIN_EXISTS(Y_ENABLE)
-  #define _Y_ENABLE_PIN Y_ENABLE_PIN,
-#else
-  #define _Y_ENABLE_PIN
+
+  #define _Y_PINS
+
 #endif
 
-#define _Y_PINS Y_STEP_PIN, Y_DIR_PIN, _Y_ENABLE_PIN _Y_MIN _Y_MAX _Y_MS1 _Y_MS2 _Y_MS3 _Y_CS
+#if HAS_Z_AXIS
+
+  #if PIN_EXISTS(Z_MIN)
+    #define _Z_MIN Z_MIN_PIN,
+  #else
+    #define _Z_MIN
+  #endif
+  #if PIN_EXISTS(Z_MAX)
+    #define _Z_MAX Z_MAX_PIN,
+  #else
+    #define _Z_MAX
+  #endif
+  #if PIN_EXISTS(Z_CS) && AXIS_HAS_SPI(Z)
+    #define _Z_CS Z_CS_PIN,
+  #else
+    #define _Z_CS
+  #endif
+  #if PIN_EXISTS(Z_MS1)
+    #define _Z_MS1 Z_MS1_PIN,
+  #else
+    #define _Z_MS1
+  #endif
+  #if PIN_EXISTS(Z_MS2)
+    #define _Z_MS2 Z_MS2_PIN,
+  #else
+    #define _Z_MS2
+  #endif
+  #if PIN_EXISTS(Z_MS3)
+    #define _Z_MS3 Z_MS3_PIN,
+  #else
+    #define _Z_MS3
+  #endif
+  #if PIN_EXISTS(Z_ENABLE)
+    #define _Z_ENABLE_PIN Z_ENABLE_PIN,
+  #else
+    #define _Z_ENABLE_PIN
+  #endif
+
+  #define _Z_PINS Z_STEP_PIN, Z_DIR_PIN, _Z_ENABLE_PIN _Z_MIN _Z_MAX _Z_MS1 _Z_MS2 _Z_MS3 _Z_CS
 
-#if PIN_EXISTS(Z_MIN)
-  #define _Z_MIN Z_MIN_PIN,
 #else
-  #define _Z_MIN
-#endif
-#if PIN_EXISTS(Z_MAX)
-  #define _Z_MAX Z_MAX_PIN,
-#else
-  #define _Z_MAX
-#endif
-#if PIN_EXISTS(Z_CS) && AXIS_HAS_SPI(Z)
-  #define _Z_CS Z_CS_PIN,
-#else
-  #define _Z_CS
-#endif
-#if PIN_EXISTS(Z_MS1)
-  #define _Z_MS1 Z_MS1_PIN,
-#else
-  #define _Z_MS1
-#endif
-#if PIN_EXISTS(Z_MS2)
-  #define _Z_MS2 Z_MS2_PIN,
-#else
-  #define _Z_MS2
-#endif
-#if PIN_EXISTS(Z_MS3)
-  #define _Z_MS3 Z_MS3_PIN,
-#else
-  #define _Z_MS3
-#endif
-#if PIN_EXISTS(Z_ENABLE)
-  #define _Z_ENABLE_PIN Z_ENABLE_PIN,
-#else
-  #define _Z_ENABLE_PIN
+
+  #define _Z_PINS
+
 #endif
 
-#define _Z_PINS Z_STEP_PIN, Z_DIR_PIN, _Z_ENABLE_PIN _Z_MIN _Z_MAX _Z_MS1 _Z_MS2 _Z_MS3 _Z_CS
+#if LINEAR_AXES >= 4
+
+  #if PIN_EXISTS(I_MIN)
+    #define _I_MIN I_MIN_PIN,
+  #else
+    #define _I_MIN
+  #endif
+  #if PIN_EXISTS(I_MAX)
+    #define _I_MAX I_MAX_PIN,
+  #else
+    #define _I_MAX
+  #endif
+  #if PIN_EXISTS(I_CS)
+    #define _I_CS I_CS_PIN,
+  #else
+    #define _I_CS
+  #endif
+  #if PIN_EXISTS(I_MS1)
+    #define _I_MS1 I_MS1_PIN,
+  #else
+    #define _I_MS1
+  #endif
+  #if PIN_EXISTS(I_MS2)
+    #define _I_MS2 I_MS2_PIN,
+  #else
+    #define _I_MS2
+  #endif
+  #if PIN_EXISTS(I_MS3)
+    #define _I_MS3 I_MS3_PIN,
+  #else
+    #define _I_MS3
+  #endif
+
+  #define _I_PINS I_STEP_PIN, I_DIR_PIN, I_ENABLE_PIN, _I_MIN _I_MAX _I_MS1 _I_MS2 _I_MS3 _I_CS
+
+#else
+
+  #define _I_PINS
+
+#endif
+
+#if LINEAR_AXES >= 5
+
+  #if PIN_EXISTS(J_MIN)
+    #define _J_MIN J_MIN_PIN,
+  #else
+    #define _J_MIN
+  #endif
+  #if PIN_EXISTS(J_MAX)
+    #define _J_MAX J_MAX_PIN,
+  #else
+    #define _J_MAX
+  #endif
+  #if PIN_EXISTS(J_CS)
+    #define _J_CS J_CS_PIN,
+  #else
+    #define _J_CS
+  #endif
+  #if PIN_EXISTS(J_MS1)
+    #define _J_MS1 J_MS1_PIN,
+  #else
+    #define _J_MS1
+  #endif
+  #if PIN_EXISTS(J_MS2)
+    #define _J_MS2 J_MS2_PIN,
+  #else
+    #define _J_MS2
+  #endif
+  #if PIN_EXISTS(J_MS3)
+    #define _J_MS3 J_MS3_PIN,
+  #else
+    #define _J_MS3
+  #endif
+
+  #define _J_PINS J_STEP_PIN, J_DIR_PIN, J_ENABLE_PIN, _J_MIN _J_MAX _J_MS1 _J_MS2 _J_MS3 _J_CS
+
+#else
+
+  #define _J_PINS
+
+#endif
+
+#if LINEAR_AXES >= 6
+
+  #if PIN_EXISTS(K_MIN)
+    #define _K_MIN K_MIN_PIN,
+  #else
+    #define _K_MIN
+  #endif
+  #if PIN_EXISTS(K_MAX)
+    #define _K_MAX K_MAX_PIN,
+  #else
+    #define _K_MAX
+  #endif
+  #if PIN_EXISTS(K_CS)
+    #define _K_CS K_CS_PIN,
+  #else
+    #define _K_CS
+  #endif
+  #if PIN_EXISTS(K_MS1)
+    #define _K_MS1 K_MS1_PIN,
+  #else
+    #define _K_MS1
+  #endif
+  #if PIN_EXISTS(K_MS2)
+    #define _K_MS2 K_MS2_PIN,
+  #else
+    #define _K_MS2
+  #endif
+  #if PIN_EXISTS(K_MS3)
+    #define _K_MS3 K_MS3_PIN,
+  #else
+    #define _K_MS3
+  #endif
+
+  #define _K_PINS K_STEP_PIN, K_DIR_PIN, K_ENABLE_PIN, _K_MIN _K_MAX _K_MS1 _K_MS2 _K_MS3 _K_CS
+
+#else
+
+  #define _K_PINS
+
+#endif
 
 //
 // Extruder Chip Select, Digital Micro-steps
@@ -714,7 +853,8 @@
 #endif
 
 #define SENSITIVE_PINS { \
-  _X_PINS _Y_PINS _Z_PINS _X2_PINS _Y2_PINS _Z2_PINS _Z3_PINS _Z4_PINS _Z_PROBE \
+  _X_PINS _Y_PINS _Z_PINS _I_PINS _J_PINS _K_PINS \
+  _X2_PINS _Y2_PINS _Z2_PINS _Z3_PINS _Z4_PINS _Z_PROBE \
   _E0_PINS _E1_PINS _E2_PINS _E3_PINS _E4_PINS _E5_PINS _E6_PINS _E7_PINS \
   _H0_PINS _H1_PINS _H2_PINS _H3_PINS _H4_PINS _H5_PINS _H6_PINS _H7_PINS \
   _PS_ON _FAN0 _FAN1 _FAN2 _FAN3 _FAN4 _FAN5 _FAN6 _FAN7 _FANC \