From af36f654d1bc33c6b8b0e04aa1b2af9c99aff859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 27 Feb 2022 16:03:24 +0000 Subject: [PATCH] Optimise a few uses of SERIAL_PROTOCOLLN Saves 34 bytes of flash memory and reduces code by 8 lines. --- Firmware/Marlin_main.cpp | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 0ed2f5b09..c7480c4cf 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3676,9 +3676,7 @@ void gcode_M114() SERIAL_PROTOCOLPGM(" Z:"); SERIAL_PROTOCOL(float(st_get_position(Z_AXIS)) / cs.axis_steps_per_unit[Z_AXIS]); SERIAL_PROTOCOLPGM(" E:"); - SERIAL_PROTOCOL(float(st_get_position(E_AXIS)) / cs.axis_steps_per_unit[E_AXIS]); - - SERIAL_PROTOCOLLN(); + SERIAL_PROTOCOLLN(float(st_get_position(E_AXIS)) / cs.axis_steps_per_unit[E_AXIS]); } #if (defined(FANCHECK) && (((defined(TACH_0) && (TACH_0 >-1)) || (defined(TACH_1) && (TACH_1 > -1))))) @@ -6158,8 +6156,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) SERIAL_PROTOCOL('.'); SERIAL_PROTOCOL(uint8_t(ip[2])); SERIAL_PROTOCOL('.'); - SERIAL_PROTOCOL(uint8_t(ip[3])); - SERIAL_PROTOCOLLN(); + SERIAL_PROTOCOLLN(uint8_t(ip[3])); } else { SERIAL_PROTOCOLPGM("?Toshiba FlashAir GetIP failed\n"); } @@ -7730,8 +7727,7 @@ Sigma_Exit: SERIAL_PROTOCOL(" Servo "); SERIAL_PROTOCOL(servo_index); SERIAL_PROTOCOL(": "); - SERIAL_PROTOCOL(servos[servo_index].read()); - SERIAL_PROTOCOLLN(); + SERIAL_PROTOCOLLN(servos[servo_index].read()); } } break; @@ -7839,8 +7835,7 @@ Sigma_Exit: SERIAL_PROTOCOL(" i:"); SERIAL_PROTOCOL(unscalePID_i(cs.bedKi)); SERIAL_PROTOCOL(" d:"); - SERIAL_PROTOCOL(unscalePID_d(cs.bedKd)); - SERIAL_PROTOCOLLN(); + SERIAL_PROTOCOLLN(unscalePID_d(cs.bedKd)); } break; #endif //PIDTEMP @@ -8272,8 +8267,7 @@ Sigma_Exit: LCD_MESSAGERPGM(_T(MSG_PLEASE_WAIT)); SERIAL_PROTOCOLPGM("Wait for PINDA target temperature:"); - SERIAL_PROTOCOL(set_target_pinda); - SERIAL_PROTOCOLLN(); + SERIAL_PROTOCOLLN(set_target_pinda); codenum = _millis(); cancel_heatup = false; @@ -8334,8 +8328,7 @@ Sigma_Exit: SERIAL_PROTOCOLPGM(", "); SERIAL_PROTOCOL(usteps); SERIAL_PROTOCOLPGM(", "); - SERIAL_PROTOCOL(mm * 1000); - SERIAL_PROTOCOLLN(); + SERIAL_PROTOCOLLN(mm * 1000); } } else if (code_seen('!')) { // ! - Set factory default values @@ -8381,8 +8374,7 @@ Sigma_Exit: SERIAL_PROTOCOLPGM(", "); SERIAL_PROTOCOL(usteps); SERIAL_PROTOCOLPGM(", "); - SERIAL_PROTOCOL(mm * 1000); - SERIAL_PROTOCOLLN(); + SERIAL_PROTOCOLLN(mm * 1000); } } }