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

Reduce string duplication

Browse Source
This commit is contained in:
Scott Lahteine
2020-06-27 23:27:28 -05:00
parent 0fad9535d1
commit dc6d8357a6
9 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3163,16 +3163,16 @@ void MarlinSettings::reset() {
CONFIG_ECHO_HEADING("Material heatup parameters:");
LOOP_L_N(i, PREHEAT_COUNT) {
CONFIG_ECHO_START();
SERIAL_ECHOLNPAIR(
" M145 S", (int)i
SERIAL_ECHOLNPAIR_P(
PSTR(" M145 S"), (int)i
#if HAS_HOTEND
, " H", TEMP_UNIT(ui.material_preset[i].hotend_temp)
, PSTR(" H"), TEMP_UNIT(ui.material_preset[i].hotend_temp)
#endif
#if HAS_HEATED_BED
, " B", TEMP_UNIT(ui.material_preset[i].bed_temp)
, SP_B_STR, TEMP_UNIT(ui.material_preset[i].bed_temp)
#endif
#if HAS_FAN
, " F", ui.material_preset[i].fan_speed
, PSTR(" F"), ui.material_preset[i].fan_speed
#endif
);
}
@ -3198,7 +3198,7 @@ void MarlinSettings::reset() {
, PSTR(" D"), unscalePID_d(PID_PARAM(Kd, e))
);
#if ENABLED(PID_EXTRUSION_SCALING)
SERIAL_ECHOPAIR(" C", PID_PARAM(Kc, e));
SERIAL_ECHOPAIR_P(SP_C_STR, PID_PARAM(Kc, e));
if (e == 0) SERIAL_ECHOPAIR(" L", thermalManager.lpq_len);
#endif
#if ENABLED(PID_FAN_SCALING)

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

@ -122,7 +122,7 @@ void recalc_delta_settings() {
#define DELTA_DEBUG(VAR) do { \
SERIAL_ECHOLNPAIR_P(PSTR("Cartesian X"), VAR.x, SP_Y_STR, VAR.y, SP_Z_STR, VAR.z); \
SERIAL_ECHOLNPAIR("Delta A", delta.a, " B", delta.b, " C", delta.c); \
SERIAL_ECHOLNPAIR_P(PSTR("Delta A"), delta.a, SP_B_STR, delta.b, SP_C_STR, delta.c); \
}while(0)
void inverse_kinematics(const xyz_pos_t &raw) {

4
Marlin/src/module/temperature.cpp
View File

@ -1281,8 +1281,8 @@ void Temperature::manage_heater() {
SERIAL_ECHOPAIR_F(" R", t.series_res, 1);
SERIAL_ECHOPAIR_F_P(SP_T_STR, t.res_25, 1);
SERIAL_ECHOPAIR_F(" B", t.beta, 1);
SERIAL_ECHOPAIR_F(" C", t.sh_c_coeff, 9);
SERIAL_ECHOPAIR_F_P(SP_B_STR, t.beta, 1);
SERIAL_ECHOPAIR_F_P(SP_C_STR, t.sh_c_coeff, 9);
SERIAL_ECHOPGM(" ; ");
serialprintPGM(
TERN_(HEATER_0_USER_THERMISTOR, t_index == CTI_HOTEND_0 ? PSTR("HOTEND 0") :)