Auto assign DIAG pins for multi-endstop (#16723)
This commit is contained in:
Scott Lahteine
GitHub
@@ -1129,40 +1129,66 @@
|
||||
|
||||
#define __EPIN(p,q) E##p##_##q##_PIN
|
||||
#define _EPIN(p,q) __EPIN(p,q)
|
||||
#define DIAG_REMAPPED(P,Q) (PIN_EXISTS(Q) && (P##_DIAG_PIN == Q##_PIN))
|
||||
|
||||
// The X2 axis, if any, should be the next open extruder port
|
||||
#define X2_E_INDEX E_STEPPERS
|
||||
|
||||
#if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS)
|
||||
#ifndef X2_STEP_PIN
|
||||
#define X2_STEP_PIN _EPIN(E_STEPPERS, STEP)
|
||||
#define X2_DIR_PIN _EPIN(E_STEPPERS, DIR)
|
||||
#define X2_ENABLE_PIN _EPIN(E_STEPPERS, ENABLE)
|
||||
#if E_STEPPERS >= MAX_EXTRUDERS || !PIN_EXISTS(X2_STEP)
|
||||
#define X2_STEP_PIN _EPIN(X2_E_INDEX, STEP)
|
||||
#define X2_DIR_PIN _EPIN(X2_E_INDEX, DIR)
|
||||
#define X2_ENABLE_PIN _EPIN(X2_E_INDEX, ENABLE)
|
||||
#if X2_E_INDEX >= MAX_EXTRUDERS || !PIN_EXISTS(X2_STEP)
|
||||
#error "No E stepper plug left for X2!"
|
||||
#endif
|
||||
#endif
|
||||
#ifndef X2_MS1_PIN
|
||||
#define X2_MS1_PIN _EPIN(E_STEPPERS, MS1)
|
||||
#define X2_MS1_PIN _EPIN(X2_E_INDEX, MS1)
|
||||
#endif
|
||||
#ifndef X2_MS2_PIN
|
||||
#define X2_MS2_PIN _EPIN(E_STEPPERS, MS2)
|
||||
#define X2_MS2_PIN _EPIN(X2_E_INDEX, MS2)
|
||||
#endif
|
||||
#ifndef X2_MS3_PIN
|
||||
#define X2_MS3_PIN _EPIN(E_STEPPERS, MS3)
|
||||
#define X2_MS3_PIN _EPIN(X2_E_INDEX, MS3)
|
||||
#endif
|
||||
#if AXIS_HAS_SPI(X2) && !defined(X2_CS_PIN)
|
||||
#define X2_CS_PIN _EPIN(E_STEPPERS, CS)
|
||||
#define X2_CS_PIN _EPIN(X2_E_INDEX, CS)
|
||||
#endif
|
||||
#if AXIS_HAS_UART(X2)
|
||||
#ifndef X2_SERIAL_TX_PIN
|
||||
#define X2_SERIAL_TX_PIN _EPIN(E_STEPPERS, SERIAL_TX)
|
||||
#define X2_SERIAL_TX_PIN _EPIN(X2_E_INDEX, SERIAL_TX)
|
||||
#endif
|
||||
#ifndef X2_SERIAL_RX_PIN
|
||||
#define X2_SERIAL_RX_PIN _EPIN(E_STEPPERS, SERIAL_RX)
|
||||
#define X2_SERIAL_RX_PIN _EPIN(X2_E_INDEX, SERIAL_RX)
|
||||
#endif
|
||||
#endif
|
||||
#define Y2_E_INDEX INCREMENT(E_STEPPERS)
|
||||
|
||||
//
|
||||
// Auto-assign pins for stallGuard sensorless homing
|
||||
//
|
||||
#if X2_STALL_SENSITIVITY && ENABLED(X_DUAL_ENDSTOPS) && _EPIN(X2_E_INDEX, DIAG) > 0
|
||||
#if DIAG_REMAPPED(X2, X_MIN) // If already remapped in the pins file...
|
||||
#define X2_USE_ENDSTOP _XMIN_
|
||||
#elif DIAG_REMAPPED(X2, Y_MIN)
|
||||
#define X2_USE_ENDSTOP _YMIN_
|
||||
#elif DIAG_REMAPPED(X2, Z_MIN)
|
||||
#define X2_USE_ENDSTOP _ZMIN_
|
||||
#elif DIAG_REMAPPED(X2, X_MAX)
|
||||
#define X2_USE_ENDSTOP _XMAX_
|
||||
#elif DIAG_REMAPPED(X2, Y_MAX)
|
||||
#define X2_USE_ENDSTOP _YMAX_
|
||||
#elif DIAG_REMAPPED(X2, Z_MAX)
|
||||
#define X2_USE_ENDSTOP _ZMAX_
|
||||
#else // Otherwise use the driver DIAG_PIN directly
|
||||
#define _X2_USE_ENDSTOP(P) _E##P##_DIAG_
|
||||
#define X2_USE_ENDSTOP _X2_USE_ENDSTOP(X2_E_INDEX)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define Y2_E_INDEX INCREMENT(X2_E_INDEX)
|
||||
#else
|
||||
#define Y2_E_INDEX E_STEPPERS
|
||||
#define Y2_E_INDEX X2_E_INDEX
|
||||
#endif
|
||||
|
||||
#ifndef X2_CS_PIN
|
||||
@@ -1208,6 +1234,24 @@
|
||||
#define Y2_SERIAL_RX_PIN _EPIN(Y2_E_INDEX, SERIAL_RX)
|
||||
#endif
|
||||
#endif
|
||||
#if Y2_STALL_SENSITIVITY && ENABLED(X_DUAL_ENDSTOPS) && _EPIN(Y2_E_INDEX, DIAG) > 0
|
||||
#if DIAG_REMAPPED(Y2, X_MIN)
|
||||
#define Y2_USE_ENDSTOP _XMIN_
|
||||
#elif DIAG_REMAPPED(Y2, Y_MIN)
|
||||
#define Y2_USE_ENDSTOP _YMIN_
|
||||
#elif DIAG_REMAPPED(Y2, Z_MIN)
|
||||
#define Y2_USE_ENDSTOP _ZMIN_
|
||||
#elif DIAG_REMAPPED(Y2, X_MAX)
|
||||
#define Y2_USE_ENDSTOP _XMAX_
|
||||
#elif DIAG_REMAPPED(Y2, Y_MAX)
|
||||
#define Y2_USE_ENDSTOP _YMAX_
|
||||
#elif DIAG_REMAPPED(Y2, Z_MAX)
|
||||
#define Y2_USE_ENDSTOP _ZMAX_
|
||||
#else
|
||||
#define _Y2_USE_ENDSTOP(P) _E##P##_DIAG_
|
||||
#define Y2_USE_ENDSTOP _Y2_USE_ENDSTOP(Y2_E_INDEX)
|
||||
#endif
|
||||
#endif
|
||||
#define Z2_E_INDEX INCREMENT(Y2_E_INDEX)
|
||||
#else
|
||||
#define Z2_E_INDEX Y2_E_INDEX
|
||||
@@ -1256,6 +1300,24 @@
|
||||
#define Z2_SERIAL_RX_PIN _EPIN(Z2_E_INDEX, SERIAL_RX)
|
||||
#endif
|
||||
#endif
|
||||
#if Z2_STALL_SENSITIVITY && ENABLED(X_DUAL_ENDSTOPS) && _EPIN(Z2_E_INDEX, DIAG) > 0
|
||||
#if DIAG_REMAPPED(Z2, X_MIN)
|
||||
#define Z2_USE_ENDSTOP _XMIN_
|
||||
#elif DIAG_REMAPPED(Z2, Y_MIN)
|
||||
#define Z2_USE_ENDSTOP _YMIN_
|
||||
#elif DIAG_REMAPPED(Z2, Z_MIN)
|
||||
#define Z2_USE_ENDSTOP _ZMIN_
|
||||
#elif DIAG_REMAPPED(Z2, X_MAX)
|
||||
#define Z2_USE_ENDSTOP _XMAX_
|
||||
#elif DIAG_REMAPPED(Z2, Y_MAX)
|
||||
#define Z2_USE_ENDSTOP _YMAX_
|
||||
#elif DIAG_REMAPPED(Z2, Z_MAX)
|
||||
#define Z2_USE_ENDSTOP _ZMAX_
|
||||
#else
|
||||
#define _Z2_USE_ENDSTOP(P) _E##P##_DIAG_
|
||||
#define Z2_USE_ENDSTOP _Z2_USE_ENDSTOP(Z2_E_INDEX)
|
||||
#endif
|
||||
#endif
|
||||
#define Z3_E_INDEX INCREMENT(Z2_E_INDEX)
|
||||
#else
|
||||
#define Z3_E_INDEX Z2_E_INDEX
|
||||
@@ -1285,7 +1347,7 @@
|
||||
#endif
|
||||
#if AXIS_HAS_SPI(Z3)
|
||||
#ifndef Z3_CS_PIN
|
||||
#define Z3_CS_PIN _EPIN(Z3_E_INDEX, CS)
|
||||
#define Z3_CS_PIN _EPIN(Z3_E_INDEX, CS)
|
||||
#endif
|
||||
#endif
|
||||
#ifndef Z3_MS1_PIN
|
||||
@@ -1305,6 +1367,24 @@
|
||||
#define Z3_SERIAL_RX_PIN _EPIN(Z3_E_INDEX, SERIAL_RX)
|
||||
#endif
|
||||
#endif
|
||||
#if Z3_STALL_SENSITIVITY && ENABLED(X_DUAL_ENDSTOPS) && _EPIN(Z3_E_INDEX, DIAG) > 0
|
||||
#if DIAG_REMAPPED(Z3, X_MIN)
|
||||
#define Z3_USE_ENDSTOP _XMIN_
|
||||
#elif DIAG_REMAPPED(Z3, Y_MIN)
|
||||
#define Z3_USE_ENDSTOP _YMIN_
|
||||
#elif DIAG_REMAPPED(Z3, Z_MIN)
|
||||
#define Z3_USE_ENDSTOP _ZMIN_
|
||||
#elif DIAG_REMAPPED(Z3, X_MAX)
|
||||
#define Z3_USE_ENDSTOP _XMAX_
|
||||
#elif DIAG_REMAPPED(Z3, Y_MAX)
|
||||
#define Z3_USE_ENDSTOP _YMAX_
|
||||
#elif DIAG_REMAPPED(Z3, Z_MAX)
|
||||
#define Z3_USE_ENDSTOP _ZMAX_
|
||||
#else
|
||||
#define _Z3_USE_ENDSTOP(P) _E##P##_DIAG_
|
||||
#define Z3_USE_ENDSTOP _Y2_USE_ENDSTOP(Y2_E_INDEX)
|
||||
#endif
|
||||
#endif
|
||||
#define Z4_E_INDEX INCREMENT(Z3_E_INDEX)
|
||||
#endif
|
||||
|
||||
@@ -1352,6 +1432,24 @@
|
||||
#define Z4_SERIAL_RX_PIN _EPIN(Z4_E_INDEX, SERIAL_RX)
|
||||
#endif
|
||||
#endif
|
||||
#if Z4_STALL_SENSITIVITY && ENABLED(X_DUAL_ENDSTOPS) && _EPIN(Z4_E_INDEX, DIAG) > 0
|
||||
#if DIAG_REMAPPED(Z4, X_MIN)
|
||||
#define Z4_USE_ENDSTOP _XMIN_
|
||||
#elif DIAG_REMAPPED(Z4, Y_MIN)
|
||||
#define Z4_USE_ENDSTOP _YMIN_
|
||||
#elif DIAG_REMAPPED(Z4, Z_MIN)
|
||||
#define Z4_USE_ENDSTOP _ZMIN_
|
||||
#elif DIAG_REMAPPED(Z4, X_MAX)
|
||||
#define Z4_USE_ENDSTOP _XMAX_
|
||||
#elif DIAG_REMAPPED(Z4, Y_MAX)
|
||||
#define Z4_USE_ENDSTOP _YMAX_
|
||||
#elif DIAG_REMAPPED(Z4, Z_MAX)
|
||||
#define Z4_USE_ENDSTOP _ZMAX_
|
||||
#else
|
||||
#define _Z4_USE_ENDSTOP(P) _E##P##_DIAG_
|
||||
#define Z4_USE_ENDSTOP _Z4_USE_ENDSTOP(Z4_E_INDEX)
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef Z4_CS_PIN
|
||||
@@ -1384,3 +1482,4 @@
|
||||
#endif
|
||||
|
||||
#undef HAS_FREE_AUX2_PINS
|
||||
#undef DIAG_REMAPPED
|
||||
|
||||
Reference in New Issue
Block a user