CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix M503 output formatting (#17893)

Browse Source
This commit is contained in:
Gurmeet Athwal 2020-05-06 14:10:04 +05:30 committed by GitHub
parent 7c26a54d3f
commit 6947dc139e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Marlin/src/module/configuration_store.cpp
View File

@ -3211,6 +3211,7 @@ void MarlinSettings::reset() {
#if AXIS_IS_TMC(Z) #if AXIS_IS_TMC(Z)
SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.getMilliamps()); SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.getMilliamps());
#endif #endif
SERIAL_EOL();
#endif #endif
#if AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z2) #if AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z2)
@ -3225,6 +3226,7 @@ void MarlinSettings::reset() {
#if AXIS_IS_TMC(Z2) #if AXIS_IS_TMC(Z2)
SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.getMilliamps()); SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.getMilliamps());
#endif #endif
SERIAL_EOL();
#endif #endif
#if AXIS_IS_TMC(Z3) #if AXIS_IS_TMC(Z3)
@ -3278,34 +3280,30 @@ void MarlinSettings::reset() {
CONFIG_ECHO_HEADING("Hybrid Threshold:"); CONFIG_ECHO_HEADING("Hybrid Threshold:");
#if AXIS_HAS_STEALTHCHOP(X) || AXIS_HAS_STEALTHCHOP(Y) || AXIS_HAS_STEALTHCHOP(Z) #if AXIS_HAS_STEALTHCHOP(X) || AXIS_HAS_STEALTHCHOP(Y) || AXIS_HAS_STEALTHCHOP(Z)
say_M913(forReplay); say_M913(forReplay);
#endif #if AXIS_HAS_STEALTHCHOP(X)
#if AXIS_HAS_STEALTHCHOP(X) SERIAL_ECHOPAIR_P(SP_X_STR, stepperX.get_pwm_thrs());
SERIAL_ECHOPAIR_P(SP_X_STR, stepperX.get_pwm_thrs()); #endif
#endif #if AXIS_HAS_STEALTHCHOP(Y)
#if AXIS_HAS_STEALTHCHOP(Y) SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY.get_pwm_thrs());
SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY.get_pwm_thrs()); #endif
#endif #if AXIS_HAS_STEALTHCHOP(Z)
#if AXIS_HAS_STEALTHCHOP(Z) SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.get_pwm_thrs());
SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.get_pwm_thrs()); #endif
#endif
#if AXIS_HAS_STEALTHCHOP(X) || AXIS_HAS_STEALTHCHOP(Y) || AXIS_HAS_STEALTHCHOP(Z)
SERIAL_EOL(); SERIAL_EOL();
#endif #endif
#if AXIS_HAS_STEALTHCHOP(X2) || AXIS_HAS_STEALTHCHOP(Y2) || AXIS_HAS_STEALTHCHOP(Z2) #if AXIS_HAS_STEALTHCHOP(X2) || AXIS_HAS_STEALTHCHOP(Y2) || AXIS_HAS_STEALTHCHOP(Z2)
say_M913(forReplay); say_M913(forReplay);
SERIAL_ECHOPGM(" I1"); SERIAL_ECHOPGM(" I1");
#endif #if AXIS_HAS_STEALTHCHOP(X2)
#if AXIS_HAS_STEALTHCHOP(X2) SERIAL_ECHOPAIR_P(SP_X_STR, stepperX2.get_pwm_thrs());
SERIAL_ECHOPAIR_P(SP_X_STR, stepperX2.get_pwm_thrs()); #endif
#endif #if AXIS_HAS_STEALTHCHOP(Y2)
#if AXIS_HAS_STEALTHCHOP(Y2) SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY2.get_pwm_thrs());
SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY2.get_pwm_thrs()); #endif
#endif #if AXIS_HAS_STEALTHCHOP(Z2)
#if AXIS_HAS_STEALTHCHOP(Z2) SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.get_pwm_thrs());
SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.get_pwm_thrs()); #endif
#endif
#if AXIS_HAS_STEALTHCHOP(X2) || AXIS_HAS_STEALTHCHOP(Y2) || AXIS_HAS_STEALTHCHOP(Z2)
SERIAL_EOL(); SERIAL_EOL();
#endif #endif