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

Serial macros cleanup

Browse Source
This commit is contained in:
Scott Lahteine
2021-02-28 19:43:46 -06:00
committed by Scott Lahteine
parent f0b662ff58
commit dd42831cba
48 changed files with 101 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/src/module/settings.cpp
View File

@ -2990,7 +2990,7 @@ void MarlinSettings::reset() {
if (!repl) {
SERIAL_ECHO_START();
SERIAL_ECHOPGM("; ");
serialprintPGM(pstr);
SERIAL_ECHOPGM_P(pstr);
if (eol) SERIAL_EOL();
}
}
@ -3007,7 +3007,7 @@ void MarlinSettings::reset() {
SERIAL_ECHOPGM(" M569 S1");
if (etc) {
SERIAL_CHAR(' ');
serialprintPGM(etc);
SERIAL_ECHOPGM_P(etc);
}
if (newLine) SERIAL_EOL();
}
@ -3025,7 +3025,7 @@ void MarlinSettings::reset() {
#endif
inline void say_units(const bool colon) {
serialprintPGM(
SERIAL_ECHOPGM_P(
#if ENABLED(INCH_MODE_SUPPORT)
parser.linear_unit_factor != 1.0 ? PSTR(" (in)") :
#endif
@ -3066,7 +3066,7 @@ void MarlinSettings::reset() {
SERIAL_ECHOPGM(" M149 ");
SERIAL_CHAR(parser.temp_units_code());
SERIAL_ECHOPGM(" ; Units in ");
serialprintPGM(parser.temp_units_name());
SERIAL_ECHOPGM_P(parser.temp_units_name());
#else
SERIAL_ECHOLNPGM(" M149 C ; Units in Celsius");
#endif
@ -3254,12 +3254,12 @@ void MarlinSettings::reset() {
LOOP_L_N(py, GRID_MAX_POINTS_Y) {
LOOP_L_N(px, GRID_MAX_POINTS_X) {
CONFIG_ECHO_START();
SERIAL_ECHOPAIR_P(PSTR(" G29 S3 I"), px, PSTR(" J"), py);
SERIAL_ECHOPAIR(" G29 S3 I", px, " J", py);
SERIAL_ECHOLNPAIR_F_P(SP_Z_STR, LINEAR_UNIT(mbl.z_values[px][py]), 5);
}
}
CONFIG_ECHO_START();
SERIAL_ECHOLNPAIR_F_P(PSTR(" G29 S4 Z"), LINEAR_UNIT(mbl.z_offset), 5);
SERIAL_ECHOLNPAIR_F(" G29 S4 Z", LINEAR_UNIT(mbl.z_offset), 5);
}
#elif ENABLED(AUTO_BED_LEVELING_UBL)