Browse Source

[2.0.x] TMC2660 followup (#12029)

* Don't react to s2g on TMC2660. False positives
* Init with sensorless probing as well
pull/1/head
teemuatlut 6 years ago
committed by Scott Lahteine
parent
commit
dffb4c63dc
  1. 2
      Marlin/src/feature/tmc_util.cpp
  2. 2
      Marlin/src/module/stepper_indirection.cpp

2
Marlin/src/feature/tmc_util.cpp

@ -107,7 +107,7 @@
constexpr uint8_t OTPW_bp = 2; constexpr uint8_t OTPW_bp = 2;
constexpr uint32_t OT_bm = 0x2UL; constexpr uint32_t OT_bm = 0x2UL;
constexpr uint8_t OT_bp = 1; constexpr uint8_t OT_bp = 1;
constexpr uint8_t DRIVER_ERROR_bm = 0x1EUL; constexpr uint8_t DRIVER_ERROR_bm = 0x6;
TMC_driver_data data; TMC_driver_data data;
data.drv_status = st.DRVSTATUS(); data.drv_status = st.DRVSTATUS();
data.is_otpw = (data.drv_status & OTPW_bm) >> OTPW_bp; data.is_otpw = (data.drv_status & OTPW_bm) >> OTPW_bp;

2
Marlin/src/module/stepper_indirection.cpp

@ -645,7 +645,7 @@ void reset_stepper_drivers() {
{ constexpr uint8_t extruder = 5; _TMC_INIT(E5, planner.axis_steps_per_mm[E_AXIS_N]); UNUSED(extruder); } { constexpr uint8_t extruder = 5; _TMC_INIT(E5, planner.axis_steps_per_mm[E_AXIS_N]); UNUSED(extruder); }
#endif #endif
#if ENABLED(SENSORLESS_HOMING) #if USE_SENSORLESS
#if X_SENSORLESS #if X_SENSORLESS
#if AXIS_HAS_STALLGUARD(X) #if AXIS_HAS_STALLGUARD(X)
stepperX.sgt(X_STALL_SENSITIVITY); stepperX.sgt(X_STALL_SENSITIVITY);

Loading…
Cancel
Save