|
@@ -742,7 +742,8 @@ void Endstops::update() {
|
742
|
742
|
}
|
743
|
743
|
#endif
|
744
|
744
|
|
745
|
|
- // Now, we must signal, after validation, if an endstop limit is pressed or not
|
|
745
|
+ // Signal, after validation, if an endstop limit is pressed or not
|
|
746
|
+
|
746
|
747
|
if (stepper.axis_is_moving(X_AXIS)) {
|
747
|
748
|
if (stepper.motor_direction(X_AXIS_HEAD)) { // -direction
|
748
|
749
|
#if HAS_X_MIN || (X_SPI_SENSORLESS && X_HOME_DIR < 0)
|
|
@@ -804,19 +805,37 @@ void Endstops::update() {
|
804
|
805
|
bool Endstops::tmc_spi_homing_check() {
|
805
|
806
|
bool hit = false;
|
806
|
807
|
#if X_SPI_SENSORLESS
|
807
|
|
- if (tmc_spi_homing.x && stepperX.test_stall_status()) {
|
|
808
|
+ if (tmc_spi_homing.x && (stepperX.test_stall_status()
|
|
809
|
+ #if CORE_IS_XY && Y_SPI_SENSORLESS
|
|
810
|
+ || stepperY.test_stall_status()
|
|
811
|
+ #elif CORE_IS_XZ && Z_SPI_SENSORLESS
|
|
812
|
+ || stepperZ.test_stall_status()
|
|
813
|
+ #endif
|
|
814
|
+ )) {
|
808
|
815
|
SBI(live_state, X_STOP);
|
809
|
816
|
hit = true;
|
810
|
817
|
}
|
811
|
818
|
#endif
|
812
|
819
|
#if Y_SPI_SENSORLESS
|
813
|
|
- if (tmc_spi_homing.y && stepperY.test_stall_status()) {
|
|
820
|
+ if (tmc_spi_homing.y && (stepperY.test_stall_status()
|
|
821
|
+ #if CORE_IS_XY && X_SPI_SENSORLESS
|
|
822
|
+ || stepperX.test_stall_status()
|
|
823
|
+ #elif CORE_IS_YZ && Z_SPI_SENSORLESS
|
|
824
|
+ || stepperZ.test_stall_status()
|
|
825
|
+ #endif
|
|
826
|
+ )) {
|
814
|
827
|
SBI(live_state, Y_STOP);
|
815
|
828
|
hit = true;
|
816
|
829
|
}
|
817
|
830
|
#endif
|
818
|
831
|
#if Z_SPI_SENSORLESS
|
819
|
|
- if (tmc_spi_homing.z && stepperZ.test_stall_status()) {
|
|
832
|
+ if (tmc_spi_homing.z && (stepperZ.test_stall_status()
|
|
833
|
+ #if CORE_IS_XZ && X_SPI_SENSORLESS
|
|
834
|
+ || stepperX.test_stall_status()
|
|
835
|
+ #elif CORE_IS_YZ && Y_SPI_SENSORLESS
|
|
836
|
+ || stepperY.test_stall_status()
|
|
837
|
+ #endif
|
|
838
|
+ )) {
|
820
|
839
|
SBI(live_state, Z_STOP);
|
821
|
840
|
hit = true;
|
822
|
841
|
}
|