sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🚸 SPI endstops for X/Y Dual and Core (#25371)

Browse Source
This commit is contained in:
Frederik Kemner 2023-02-15 05:25:47 +01:00 committed by Scott Lahteine
parent 255bc3c90c
commit db8f501dfe
2 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
Marlin/src/module/endstops.cpp
View File

@ -1330,75 +1330,54 @@ void Endstops::update() {
bool hit = false; bool hit = false;
#if X_SPI_SENSORLESS #if X_SPI_SENSORLESS
if (tmc_spi_homing.x && (stepperX.test_stall_status() if (tmc_spi_homing.x && (stepperX.test_stall_status()
#if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX) && Y_SPI_SENSORLESS #if Y_SPI_SENSORLESS && ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX)
|| stepperY.test_stall_status() || stepperY.test_stall_status()
#elif CORE_IS_XZ && Z_SPI_SENSORLESS #elif Z_SPI_SENSORLESS && CORE_IS_XZ
|| stepperZ.test_stall_status() || stepperZ.test_stall_status()
#endif #endif
)) { )) { SBI(live_state, X_ENDSTOP); hit = true; }
SBI(live_state, X_ENDSTOP); #if ENABLED(X_DUAL_ENDSTOPS)
hit = true; if (tmc_spi_homing.x && stepperX2.test_stall_status()) { SBI(live_state, X2_ENDSTOP); hit = true; }
} #endif
#endif #endif
#if Y_SPI_SENSORLESS #if Y_SPI_SENSORLESS
if (tmc_spi_homing.y && (stepperY.test_stall_status() if (tmc_spi_homing.y && (stepperY.test_stall_status()
#if ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX) && X_SPI_SENSORLESS #if X_SPI_SENSORLESS && ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX)
|| stepperX.test_stall_status() || stepperX.test_stall_status()
#elif CORE_IS_YZ && Z_SPI_SENSORLESS #elif Z_SPI_SENSORLESS && CORE_IS_YZ
|| stepperZ.test_stall_status() || stepperZ.test_stall_status()
#endif #endif
)) { )) { SBI(live_state, Y_ENDSTOP); hit = true; }
SBI(live_state, Y_ENDSTOP); #if ENABLED(Y_DUAL_ENDSTOPS)
hit = true; if (tmc_spi_homing.y && stepperY2.test_stall_status()) { SBI(live_state, Y2_ENDSTOP); hit = true; }
} #endif
#endif #endif
#if Z_SPI_SENSORLESS #if Z_SPI_SENSORLESS
if (tmc_spi_homing.z && (stepperZ.test_stall_status() if (tmc_spi_homing.z && (stepperZ.test_stall_status()
#if CORE_IS_XZ && X_SPI_SENSORLESS #if X_SPI_SENSORLESS && CORE_IS_XZ
|| stepperX.test_stall_status() || stepperX.test_stall_status()
#elif CORE_IS_YZ && Y_SPI_SENSORLESS #elif Y_SPI_SENSORLESS && CORE_IS_YZ
|| stepperY.test_stall_status() || stepperY.test_stall_status()
#endif #endif
)) { )) { SBI(live_state, Z_ENDSTOP); hit = true; }
SBI(live_state, Z_ENDSTOP);
hit = true;
}
#endif #endif
#if I_SPI_SENSORLESS #if I_SPI_SENSORLESS
if (tmc_spi_homing.i && stepperI.test_stall_status()) { if (tmc_spi_homing.i && stepperI.test_stall_status()) { SBI(live_state, I_ENDSTOP); hit = true; }
SBI(live_state, I_ENDSTOP);
hit = true;
}
#endif #endif
#if J_SPI_SENSORLESS #if J_SPI_SENSORLESS
if (tmc_spi_homing.j && stepperJ.test_stall_status()) { if (tmc_spi_homing.j && stepperJ.test_stall_status()) { SBI(live_state, J_ENDSTOP); hit = true; }
SBI(live_state, J_ENDSTOP);
hit = true;
}
#endif #endif
#if K_SPI_SENSORLESS #if K_SPI_SENSORLESS
if (tmc_spi_homing.k && stepperK.test_stall_status()) { if (tmc_spi_homing.k && stepperK.test_stall_status()) { SBI(live_state, K_ENDSTOP); hit = true; }
SBI(live_state, K_ENDSTOP);
hit = true;
}
#endif #endif
#if U_SPI_SENSORLESS #if U_SPI_SENSORLESS
if (tmc_spi_homing.u && stepperU.test_stall_status()) { if (tmc_spi_homing.u && stepperU.test_stall_status()) { SBI(live_state, U_ENDSTOP); hit = true; }
SBI(live_state, U_ENDSTOP);
hit = true;
}
#endif #endif
#if V_SPI_SENSORLESS #if V_SPI_SENSORLESS
if (tmc_spi_homing.v && stepperV.test_stall_status()) { if (tmc_spi_homing.v && stepperV.test_stall_status()) { SBI(live_state, V_ENDSTOP); hit = true; }
SBI(live_state, V_ENDSTOP);
hit = true;
}
#endif #endif
#if W_SPI_SENSORLESS #if W_SPI_SENSORLESS
if (tmc_spi_homing.w && stepperW.test_stall_status()) { if (tmc_spi_homing.w && stepperW.test_stall_status()) { SBI(live_state, W_ENDSTOP); hit = true; }
SBI(live_state, W_ENDSTOP);
hit = true;
}
#endif #endif
if (TERN0(ENDSTOP_INTERRUPTS_FEATURE, hit)) update(); if (TERN0(ENDSTOP_INTERRUPTS_FEATURE, hit)) update();
@ -1408,7 +1387,13 @@ void Endstops::update() {
void Endstops::clear_endstop_state() { void Endstops::clear_endstop_state() {
TERN_(X_SPI_SENSORLESS, CBI(live_state, X_ENDSTOP)); TERN_(X_SPI_SENSORLESS, CBI(live_state, X_ENDSTOP));
#if BOTH(X_SPI_SENSORLESS, X_DUAL_ENDSTOPS)
CBI(live_state, X2_ENDSTOP);
#endif
TERN_(Y_SPI_SENSORLESS, CBI(live_state, Y_ENDSTOP)); TERN_(Y_SPI_SENSORLESS, CBI(live_state, Y_ENDSTOP));
#if BOTH(Y_SPI_SENSORLESS, Y_DUAL_ENDSTOPS)
CBI(live_state, Y2_ENDSTOP);
#endif
TERN_(Z_SPI_SENSORLESS, CBI(live_state, Z_ENDSTOP)); TERN_(Z_SPI_SENSORLESS, CBI(live_state, Z_ENDSTOP));
TERN_(I_SPI_SENSORLESS, CBI(live_state, I_ENDSTOP)); TERN_(I_SPI_SENSORLESS, CBI(live_state, I_ENDSTOP));
TERN_(J_SPI_SENSORLESS, CBI(live_state, J_ENDSTOP)); TERN_(J_SPI_SENSORLESS, CBI(live_state, J_ENDSTOP));

6
Marlin/src/module/endstops.h
View File

@ -85,9 +85,15 @@ enum EndstopEnum : char {
// Endstops can be either MIN or MAX but not both // Endstops can be either MIN or MAX but not both
#if HAS_X_MIN || HAS_X_MAX #if HAS_X_MIN || HAS_X_MAX
, X_ENDSTOP = TERN(X_HOME_TO_MAX, X_MAX, X_MIN) , X_ENDSTOP = TERN(X_HOME_TO_MAX, X_MAX, X_MIN)
#if ENABLED(X_DUAL_ENDSTOPS)
, X2_ENDSTOP = TERN(X_HOME_TO_MAX, X2_MAX, X2_MIN)
#endif
#endif #endif
#if HAS_Y_MIN || HAS_Y_MAX #if HAS_Y_MIN || HAS_Y_MAX
, Y_ENDSTOP = TERN(Y_HOME_TO_MAX, Y_MAX, Y_MIN) , Y_ENDSTOP = TERN(Y_HOME_TO_MAX, Y_MAX, Y_MIN)
#if ENABLED(Y_DUAL_ENDSTOPS)
, Y2_ENDSTOP = TERN(Y_HOME_TO_MAX, Y2_MAX, Y2_MIN)
#endif
#endif #endif
#if HAS_Z_MIN || HAS_Z_MAX || HOMING_Z_WITH_PROBE #if HAS_Z_MIN || HAS_Z_MAX || HOMING_Z_WITH_PROBE
, Z_ENDSTOP = TERN(Z_HOME_TO_MAX, Z_MAX, TERN(HOMING_Z_WITH_PROBE, Z_MIN_PROBE, Z_MIN)) , Z_ENDSTOP = TERN(Z_HOME_TO_MAX, Z_MAX, TERN(HOMING_Z_WITH_PROBE, Z_MIN_PROBE, Z_MIN))