Browse Source

[2.0.x] TMC2660 followup (#12029)

* Don't react to s2g on TMC2660. False positives
* Init with sensorless probing as well
teemuatlut 6 years ago
parent
commit
dffb4c63dc
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      Marlin/src/feature/tmc_util.cpp
  2. 1
    1
      Marlin/src/module/stepper_indirection.cpp

+ 1
- 1
Marlin/src/feature/tmc_util.cpp View File

107
       constexpr uint8_t OTPW_bp = 2;
107
       constexpr uint8_t OTPW_bp = 2;
108
       constexpr uint32_t OT_bm = 0x2UL;
108
       constexpr uint32_t OT_bm = 0x2UL;
109
       constexpr uint8_t OT_bp = 1;
109
       constexpr uint8_t OT_bp = 1;
110
-      constexpr uint8_t DRIVER_ERROR_bm = 0x1EUL;
110
+      constexpr uint8_t DRIVER_ERROR_bm = 0x6;
111
       TMC_driver_data data;
111
       TMC_driver_data data;
112
       data.drv_status = st.DRVSTATUS();
112
       data.drv_status = st.DRVSTATUS();
113
       data.is_otpw = (data.drv_status & OTPW_bm) >> OTPW_bp;
113
       data.is_otpw = (data.drv_status & OTPW_bm) >> OTPW_bp;

+ 1
- 1
Marlin/src/module/stepper_indirection.cpp View File

645
     { constexpr uint8_t extruder = 5; _TMC_INIT(E5, planner.axis_steps_per_mm[E_AXIS_N]); UNUSED(extruder); }
645
     { constexpr uint8_t extruder = 5; _TMC_INIT(E5, planner.axis_steps_per_mm[E_AXIS_N]); UNUSED(extruder); }
646
   #endif
646
   #endif
647
 
647
 
648
-  #if ENABLED(SENSORLESS_HOMING)
648
+  #if USE_SENSORLESS
649
     #if X_SENSORLESS
649
     #if X_SENSORLESS
650
       #if AXIS_HAS_STALLGUARD(X)
650
       #if AXIS_HAS_STALLGUARD(X)
651
         stepperX.sgt(X_STALL_SENSITIVITY);
651
         stepperX.sgt(X_STALL_SENSITIVITY);

Loading…
Cancel
Save