bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

More serial macro cleanup

Browse Source
This commit is contained in:
Scott Lahteine
2019-12-01 22:23:19 -06:00
parent 9114a14eca
commit cb7817093f
3 changed files with 29 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3124,45 +3124,31 @@ void MarlinSettings::reset() {
#if AXIS_IS_TMC(X) || AXIS_IS_TMC(Y) || AXIS_IS_TMC(Z)
say_M906(forReplay);
SERIAL_ECHOLNPAIR_P(
#if AXIS_IS_TMC(X)
SP_X_STR, stepperX.getMilliamps()
#endif
#if AXIS_IS_TMC(Y)
#if AXIS_IS_TMC(X)
,
#endif
SP_Y_STR, stepperY.getMilliamps()
#endif
#if AXIS_IS_TMC(Z)
#if AXIS_IS_TMC(X) || AXIS_IS_TMC(Y)
,
#endif
SP_Z_STR, stepperZ.getMilliamps()
#endif
);
#if AXIS_IS_TMC(X)
SERIAL_ECHOPAIR_P(SP_X_STR, stepperX.getMilliamps());
#endif
#if AXIS_IS_TMC(Y)
SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY.getMilliamps());
#endif
#if AXIS_IS_TMC(Z)
SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ.getMilliamps());
#endif
SERIAL_EOL();
#endif
#if AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y2) || AXIS_IS_TMC(Z2)
say_M906(forReplay);
SERIAL_ECHOPGM(" I1");
SERIAL_ECHOLNPAIR_P(
#if AXIS_IS_TMC(X2)
SP_X_STR, stepperX2.getMilliamps()
#endif
#if AXIS_IS_TMC(Y2)
#if AXIS_IS_TMC(X2)
,
#endif
SP_Y_STR, stepperY2.getMilliamps()
#endif
#if AXIS_IS_TMC(Z2)
#if AXIS_IS_TMC(X2) || AXIS_IS_TMC(Y2)
,
#endif
SP_Z_STR, stepperZ2.getMilliamps()
#endif
);
#if AXIS_IS_TMC(X2)
SERIAL_ECHOPAIR_P(SP_X_STR, stepperX2.getMilliamps());
#endif
#if AXIS_IS_TMC(Y2)
SERIAL_ECHOPAIR_P(SP_Y_STR, stepperY2.getMilliamps());
#endif
#if AXIS_IS_TMC(Z2)
SERIAL_ECHOPAIR_P(SP_Z_STR, stepperZ2.getMilliamps());
#endif
SERIAL_EOL();
#endif
#if AXIS_IS_TMC(Z3)
@ -3333,9 +3319,9 @@ void MarlinSettings::reset() {
if (chop_x || chop_y || chop_z) {
say_M569(forReplay);
if (chop_x) SERIAL_ECHOPGM_P(SP_X_STR);
if (chop_y) SERIAL_ECHOPGM_P(SP_Y_STR);
if (chop_z) SERIAL_ECHOPGM_P(SP_Z_STR);
if (chop_x) SERIAL_ECHO_P(SP_X_STR);
if (chop_y) SERIAL_ECHO_P(SP_Y_STR);
if (chop_z) SERIAL_ECHO_P(SP_Z_STR);
SERIAL_EOL();
}
@ -3357,9 +3343,9 @@ void MarlinSettings::reset() {
if (chop_x2 || chop_y2 || chop_z2) {
say_M569(forReplay, PSTR("I1"));
if (chop_x2) SERIAL_ECHOPGM_P(SP_X_STR);
if (chop_y2) SERIAL_ECHOPGM_P(SP_Y_STR);
if (chop_z2) SERIAL_ECHOPGM_P(SP_Z_STR);
if (chop_x2) SERIAL_ECHO_P(SP_X_STR);
if (chop_y2) SERIAL_ECHO_P(SP_Y_STR);
if (chop_z2) SERIAL_ECHO_P(SP_Z_STR);
SERIAL_EOL();
}