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

Extend SERIAL_CHAR to take multiple arguments

Browse Source
This commit is contained in:
Scott Lahteine
2020-01-08 18:31:57 -06:00
parent 5beca89412
commit 95046c9047
14 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/module/endstops.cpp
View File

@ -471,7 +471,7 @@ void _O2 Endstops::report_states() {
#endif
}
SERIAL_ECHOPGM(MSG_FILAMENT_RUNOUT_SENSOR);
if (i > 1) { SERIAL_CHAR(' '); SERIAL_CHAR('0' + i); }
if (i > 1) SERIAL_CHAR(' ', '0' + i);
print_es_state(extDigitalRead(pin) != FIL_RUNOUT_INVERTING);
}
#endif

93
Marlin/src/module/stepper.cpp
View File

@ -2932,77 +2932,78 @@ void Stepper::report_positions() {
}
void Stepper::microstep_readings() {
SERIAL_ECHOPGM("MS1,MS2,MS3 Pins\nX: ");
SERIAL_ECHOLNPGM("MS1|MS2|MS3 Pins");
#if HAS_X_MICROSTEPS
SERIAL_CHAR('0' + READ(X_MS1_PIN));
SERIAL_CHAR('0' + READ(X_MS2_PIN));
#if PIN_EXISTS(X_MS3)
SERIAL_ECHOLN((int)READ(X_MS3_PIN));
#endif
SERIAL_ECHOPGM("X: ");
SERIAL_CHAR('0' + READ(X_MS1_PIN), '0' + READ(X_MS2_PIN)
#if PIN_EXISTS(X_MS3)
, '0' + READ(X_MS3_PIN)
#endif
);
#endif
#if HAS_Y_MICROSTEPS
SERIAL_ECHOPGM("Y: ");
SERIAL_CHAR('0' + READ(Y_MS1_PIN));
SERIAL_CHAR('0' + READ(Y_MS2_PIN));
#if PIN_EXISTS(Y_MS3)
SERIAL_ECHOLN((int)READ(Y_MS3_PIN));
#endif
SERIAL_CHAR('0' + READ(Y_MS1_PIN), '0' + READ(Y_MS2_PIN)
#if PIN_EXISTS(Y_MS3)
, '0' + READ(Y_MS3_PIN)
#endif
);
#endif
#if HAS_Z_MICROSTEPS
SERIAL_ECHOPGM("Z: ");
SERIAL_CHAR('0' + READ(Z_MS1_PIN));
SERIAL_CHAR('0' + READ(Z_MS2_PIN));
#if PIN_EXISTS(Z_MS3)
SERIAL_ECHOLN((int)READ(Z_MS3_PIN));
#endif
SERIAL_CHAR('0' + READ(Z_MS1_PIN), '0' + READ(Z_MS2_PIN)
#if PIN_EXISTS(Z_MS3)
, '0' + READ(Z_MS3_PIN)
#endif
);
#endif
#if HAS_E0_MICROSTEPS
SERIAL_ECHOPGM("E0: ");
SERIAL_CHAR('0' + READ(E0_MS1_PIN));
SERIAL_CHAR('0' + READ(E0_MS2_PIN));
#if PIN_EXISTS(E0_MS3)
SERIAL_ECHOLN((int)READ(E0_MS3_PIN));
#endif
SERIAL_CHAR('0' + READ(E0_MS1_PIN), '0' + READ(E0_MS2_PIN)
#if PIN_EXISTS(E0_MS3)
, '0' + READ(E0_MS3_PIN)
#endif
);
#endif
#if HAS_E1_MICROSTEPS
SERIAL_ECHOPGM("E1: ");
SERIAL_CHAR('0' + READ(E1_MS1_PIN));
SERIAL_CHAR('0' + READ(E1_MS2_PIN));
#if PIN_EXISTS(E1_MS3)
SERIAL_ECHOLN((int)READ(E1_MS3_PIN));
#endif
SERIAL_CHAR('0' + READ(E1_MS1_PIN), '0' + READ(E1_MS2_PIN)
#if PIN_EXISTS(E1_MS3)
, '0' + READ(E1_MS3_PIN)
#endif
);
#endif
#if HAS_E2_MICROSTEPS
SERIAL_ECHOPGM("E2: ");
SERIAL_CHAR('0' + READ(E2_MS1_PIN));
SERIAL_CHAR('0' + READ(E2_MS2_PIN));
#if PIN_EXISTS(E2_MS3)
SERIAL_ECHOLN((int)READ(E2_MS3_PIN));
#endif
SERIAL_CHAR('0' + READ(E2_MS1_PIN), '0' + READ(E2_MS2_PIN)
#if PIN_EXISTS(E2_MS3)
, '0' + READ(E2_MS3_PIN)
#endif
);
#endif
#if HAS_E3_MICROSTEPS
SERIAL_ECHOPGM("E3: ");
SERIAL_CHAR('0' + READ(E3_MS1_PIN));
SERIAL_CHAR('0' + READ(E3_MS2_PIN));
#if PIN_EXISTS(E3_MS3)
SERIAL_ECHOLN((int)READ(E3_MS3_PIN));
#endif
SERIAL_CHAR('0' + READ(E3_MS1_PIN), '0' + READ(E3_MS2_PIN)
#if PIN_EXISTS(E3_MS3)
, '0' + READ(E3_MS3_PIN)
#endif
);
#endif
#if HAS_E4_MICROSTEPS
SERIAL_ECHOPGM("E4: ");
SERIAL_CHAR('0' + READ(E4_MS1_PIN));
SERIAL_CHAR('0' + READ(E4_MS2_PIN));
#if PIN_EXISTS(E4_MS3)
SERIAL_ECHOLN((int)READ(E4_MS3_PIN));
#endif
SERIAL_CHAR('0' + READ(E4_MS1_PIN), '0' + READ(E4_MS2_PIN)
#if PIN_EXISTS(E4_MS3)
, '0' + READ(E4_MS3_PIN)
#endif
);
#endif
#if HAS_E5_MICROSTEPS
SERIAL_ECHOPGM("E5: ");
SERIAL_CHAR('0' + READ(E5_MS1_PIN));
SERIAL_ECHOLN((int)READ(E5_MS2_PIN));
#if PIN_EXISTS(E5_MS3)
SERIAL_ECHOLN((int)READ(E5_MS3_PIN));
#endif
SERIAL_CHAR('0' + READ(E5_MS1_PIN), '0' + READ(E5_MS2_PIN)
#if PIN_EXISTS(E5_MS3)
, '0' + READ(E5_MS3_PIN)
#endif
);
#endif
}