SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

No M914 or SGT set for non-sensorless axes

Browse source
This commit is contained in:
Scott Lahteine 2018-07-03 19:24:44 -05:00
parent c7ec6c68e7
commit 9c058091e9
2 changed files with 63 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
Marlin/src/gcode/feature/trinamic/M911-M915.cpp
View file

@ -268,58 +268,70 @@ void GcodeSuite::M912() {
const int8_t value = (int8_t)constrain(parser.value_int(), -64, 63); const int8_t value = (int8_t)constrain(parser.value_int(), -64, 63);
report = false; report = false;
switch (i) { switch (i) {
case X_AXIS: #if X_SENSORLESS
#if ENABLED(X_IS_TMC2130) || ENABLED(IS_TRAMS) case X_AXIS:
if (index == 0) TMC_SET_SGT(X); #if ENABLED(X_IS_TMC2130) || ENABLED(IS_TRAMS)
#endif if (index == 0) TMC_SET_SGT(X);
#if ENABLED(X2_IS_TMC2130) #endif
if (index == 1) TMC_SET_SGT(X2); #if ENABLED(X2_IS_TMC2130)
#endif if (index == 1) TMC_SET_SGT(X2);
break; #endif
case Y_AXIS: break;
#if ENABLED(Y_IS_TMC2130) || ENABLED(IS_TRAMS) #endif
if (index == 0) TMC_SET_SGT(Y); #if Y_SENSORLESS
#endif case Y_AXIS:
#if ENABLED(Y2_IS_TMC2130) #if ENABLED(Y_IS_TMC2130) || ENABLED(IS_TRAMS)
if (index == 1) TMC_SET_SGT(Y2); if (index == 0) TMC_SET_SGT(Y);
#endif #endif
break; #if ENABLED(Y2_IS_TMC2130)
case Z_AXIS: if (index == 1) TMC_SET_SGT(Y2);
#if ENABLED(Z_IS_TMC2130) || ENABLED(IS_TRAMS) #endif
if (index == 0) TMC_SET_SGT(Z); break;
#endif #endif
#if ENABLED(Z2_IS_TMC2130) #if Z_SENSORLESS
if (index == 1) TMC_SET_SGT(Z2); case Z_AXIS:
#endif #if ENABLED(Z_IS_TMC2130) || ENABLED(IS_TRAMS)
break; if (index == 0) TMC_SET_SGT(Z);
#endif
#if ENABLED(Z2_IS_TMC2130)
if (index == 1) TMC_SET_SGT(Z2);
#endif
break;
#endif
} }
} }
if (report) LOOP_XYZ(i) switch (i) { if (report) LOOP_XYZ(i) switch (i) {
case X_AXIS: #if X_SENSORLESS
#if ENABLED(X_IS_TMC2130) || ENABLED(IS_TRAMS) case X_AXIS:
TMC_SAY_SGT(X); #if ENABLED(X_IS_TMC2130) || ENABLED(IS_TRAMS)
#endif TMC_SAY_SGT(X);
#if ENABLED(X2_IS_TMC2130) #endif
TMC_SAY_SGT(X2); #if ENABLED(X2_IS_TMC2130)
#endif TMC_SAY_SGT(X2);
break; #endif
case Y_AXIS: break;
#if ENABLED(Y_IS_TMC2130) || ENABLED(IS_TRAMS) #endif
TMC_SAY_SGT(Y); #if Y_SENSORLESS
#endif case Y_AXIS:
#if ENABLED(Y2_IS_TMC2130) #if ENABLED(Y_IS_TMC2130) || ENABLED(IS_TRAMS)
TMC_SAY_SGT(Y2); TMC_SAY_SGT(Y);
#endif #endif
break; #if ENABLED(Y2_IS_TMC2130)
case Z_AXIS: TMC_SAY_SGT(Y2);
#if ENABLED(Z_IS_TMC2130) || ENABLED(IS_TRAMS) #endif
TMC_SAY_SGT(Z); break;
#endif #endif
#if ENABLED(Z2_IS_TMC2130) #if Z_SENSORLESS
TMC_SAY_SGT(Z2); case Z_AXIS:
#endif #if ENABLED(Z_IS_TMC2130) || ENABLED(IS_TRAMS)
break; TMC_SAY_SGT(Z);
#endif
#if ENABLED(Z2_IS_TMC2130)
TMC_SAY_SGT(Z2);
#endif
break;
#endif
} }
} }
#endif // SENSORLESS_HOMING #endif // SENSORLESS_HOMING

6
Marlin/src/module/stepper_indirection.cpp
View file

@ -249,7 +249,7 @@
#if ENABLED(SENSORLESS_HOMING) #if ENABLED(SENSORLESS_HOMING)
#define TMC_INIT_SGT(P,Q) stepper##Q.sgt(P##_HOMING_SENSITIVITY); #define TMC_INIT_SGT(P,Q) stepper##Q.sgt(P##_HOMING_SENSITIVITY);
#ifdef X_HOMING_SENSITIVITY #if X_SENSORLESS
#if ENABLED(X_IS_TMC2130) || ENABLED(IS_TRAMS) #if ENABLED(X_IS_TMC2130) || ENABLED(IS_TRAMS)
stepperX.sgt(X_HOMING_SENSITIVITY); stepperX.sgt(X_HOMING_SENSITIVITY);
#endif #endif
@ -257,7 +257,7 @@
stepperX2.sgt(X_HOMING_SENSITIVITY); stepperX2.sgt(X_HOMING_SENSITIVITY);
#endif #endif
#endif #endif
#ifdef Y_HOMING_SENSITIVITY #if Y_SENSORLESS
#if ENABLED(Y_IS_TMC2130) || ENABLED(IS_TRAMS) #if ENABLED(Y_IS_TMC2130) || ENABLED(IS_TRAMS)
stepperY.sgt(Y_HOMING_SENSITIVITY); stepperY.sgt(Y_HOMING_SENSITIVITY);
#endif #endif
@ -265,7 +265,7 @@
stepperY2.sgt(Y_HOMING_SENSITIVITY); stepperY2.sgt(Y_HOMING_SENSITIVITY);
#endif #endif
#endif #endif
#ifdef Z_HOMING_SENSITIVITY #if Z_SENSORLESS
#if ENABLED(Z_IS_TMC2130) || ENABLED(IS_TRAMS) #if ENABLED(Z_IS_TMC2130) || ENABLED(IS_TRAMS)
stepperZ.sgt(Z_HOMING_SENSITIVITY); stepperZ.sgt(Z_HOMING_SENSITIVITY);
#endif #endif