♻️ Simplify SERIAL_ECHO (MarlinFirmware#25928)

Since this increases AVR code size, try to optimize further.

Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp

@@ -91,15 +91,9 @@ bool PersistentStore::access_finish() {
 static void debug_rw(const bool write, int &pos, const uint8_t *value, const size_t size, const FRESULT s, const size_t total=0) {
  #if ENABLED(DEBUG_SD_EEPROM_EMULATION)
  FSTR_P const rw_str = write ? F("write") : F("read");
- SERIAL_CHAR(' ');
- SERIAL_ECHOF(rw_str);
- SERIAL_ECHOLNPGM("_data(", pos, ",", *value, ",", size, ", ...)");
- if (total) {
- SERIAL_ECHOPGM(" f_");
- SERIAL_ECHOF(rw_str);
- SERIAL_ECHOPGM("()=", s, "\n size=", size, "\n bytes_");
- SERIAL_ECHOLNF(write ? F("written=") : F("read="), total);
- }
+ SERIAL_ECHOLN(AS_CHAR(' '), rw_str, F("_data("), pos, AS_CHAR(','), *value, AS_CHAR(','), size, F(", ...)"));
+ if (total)
+ SERIAL_ECHOLN(F(" f_"), rw_str, F("()="), s, F("\n size="), size, F("\n bytes_"), write ? F("written=") : F("read="), total);
  else
  SERIAL_ECHOLNPGM(" f_lseek()=", s);
  #endif

Marlin/src/HAL/shared/Delay.cpp

@@ -109,13 +109,7 @@
  #if ENABLED(MARLIN_DEV_MODE)
  void dump_delay_accuracy_check() {
  auto report_call_time = [](FSTR_P const name, FSTR_P const unit, const uint32_t cycles, const uint32_t total, const bool do_flush=true) {
- SERIAL_ECHOPGM("Calling ");
- SERIAL_ECHOF(name);
- SERIAL_ECHOLNPGM(" for ", cycles);
- SERIAL_ECHOF(unit);
- SERIAL_ECHOLNPGM(" took: ", total);
- SERIAL_CHAR(' ');
- SERIAL_ECHOF(unit);
+ SERIAL_ECHOLN(F("Calling "), name, F(" for "), cycles, AS_CHAR(' '), unit, F(" took: "), total, AS_CHAR(' '), unit);
  if (do_flush) SERIAL_FLUSHTX();
  };
 

Marlin/src/MarlinCore.cpp

@@ -885,7 +885,7 @@ void kill(FSTR_P const lcd_error/*=nullptr*/, FSTR_P const lcd_component/*=nullp
  TERN_(HAS_CUTTER, cutter.kill()); // Full cutter shutdown including ISR control
 
  // Echo the LCD message to serial for extra context
- if (lcd_error) { SERIAL_ECHO_START(); SERIAL_ECHOLNF(lcd_error); }
+ if (lcd_error) { SERIAL_ECHO_START(); SERIAL_ECHOLN(lcd_error); }
 
  #if HAS_DISPLAY
  ui.kill_screen(lcd_error ?: GET_TEXT_F(MSG_KILLED), lcd_component ?: FPSTR(NUL_STR));

Marlin/src/core/debug_out.h

@@ -31,19 +31,11 @@
 #undef DEBUG_ERROR_START
 #undef DEBUG_CHAR
 #undef DEBUG_ECHO
-#undef DEBUG_DECIMAL
-#undef DEBUG_ECHO_F
 #undef DEBUG_ECHOLN
 #undef DEBUG_ECHOPGM
 #undef DEBUG_ECHOLNPGM
-#undef DEBUG_ECHOF
-#undef DEBUG_ECHOLNF
 #undef DEBUG_ECHOPGM_P
 #undef DEBUG_ECHOLNPGM_P
-#undef DEBUG_ECHOPAIR_F
-#undef DEBUG_ECHOPAIR_F_P
-#undef DEBUG_ECHOLNPAIR_F
-#undef DEBUG_ECHOLNPAIR_F_P
 #undef DEBUG_ECHO_MSG
 #undef DEBUG_ERROR_MSG
 #undef DEBUG_EOL
@@ -63,21 +55,13 @@
  #define DEBUG_ERROR_START SERIAL_ERROR_START
  #define DEBUG_CHAR SERIAL_CHAR
  #define DEBUG_ECHO SERIAL_ECHO
- #define DEBUG_DECIMAL SERIAL_DECIMAL
- #define DEBUG_ECHO_F SERIAL_ECHO_F
  #define DEBUG_ECHOLN SERIAL_ECHOLN
  #define DEBUG_ECHOPGM SERIAL_ECHOPGM
  #define DEBUG_ECHOLNPGM SERIAL_ECHOLNPGM
- #define DEBUG_ECHOF SERIAL_ECHOF
- #define DEBUG_ECHOLNF SERIAL_ECHOLNF
  #define DEBUG_ECHOPGM SERIAL_ECHOPGM
  #define DEBUG_ECHOPGM_P SERIAL_ECHOPGM_P
- #define DEBUG_ECHOPAIR_F SERIAL_ECHOPAIR_F
- #define DEBUG_ECHOPAIR_F_P SERIAL_ECHOPAIR_F_P
  #define DEBUG_ECHOLNPGM SERIAL_ECHOLNPGM
  #define DEBUG_ECHOLNPGM_P SERIAL_ECHOLNPGM_P
- #define DEBUG_ECHOLNPAIR_F SERIAL_ECHOLNPAIR_F
- #define DEBUG_ECHOLNPAIR_F_P SERIAL_ECHOLNPAIR_F_P
  #define DEBUG_ECHO_MSG SERIAL_ECHO_MSG
  #define DEBUG_ERROR_MSG SERIAL_ERROR_MSG
  #define DEBUG_EOL SERIAL_EOL
@@ -94,19 +78,11 @@
  #define DEBUG_ERROR_START() NOOP
  #define DEBUG_CHAR(...) NOOP
  #define DEBUG_ECHO(...) NOOP
- #define DEBUG_DECIMAL(...) NOOP
- #define DEBUG_ECHO_F(...) NOOP
  #define DEBUG_ECHOLN(...) NOOP
  #define DEBUG_ECHOPGM(...) NOOP
  #define DEBUG_ECHOLNPGM(...) NOOP
- #define DEBUG_ECHOF(...) NOOP
- #define DEBUG_ECHOLNF(...) NOOP
  #define DEBUG_ECHOPGM_P(...) NOOP
  #define DEBUG_ECHOLNPGM_P(...) NOOP
- #define DEBUG_ECHOPAIR_F(...) NOOP
- #define DEBUG_ECHOPAIR_F_P(...) NOOP
- #define DEBUG_ECHOLNPAIR_F(...) NOOP
- #define DEBUG_ECHOLNPAIR_F_P(...) NOOP
  #define DEBUG_ECHO_MSG(...) NOOP
  #define DEBUG_ERROR_MSG(...) NOOP
  #define DEBUG_EOL() NOOP

Marlin/src/core/debug_section.h

@@ -38,11 +38,8 @@ class SectionLog {
  bool debug;
 
  void echo_msg(FSTR_P const fpre) {
- SERIAL_ECHOF(fpre);
- if (the_msg) {
- SERIAL_CHAR(' ');
- SERIAL_ECHOF(the_msg);
- }
+ SERIAL_ECHO(fpre);
+ if (the_msg) SERIAL_ECHO(AS_CHAR(' '), the_msg);
  SERIAL_CHAR(' ');
  print_pos(current_position);
  }

Marlin/src/core/serial.cpp

@@ -68,26 +68,51 @@ MAP(_N_LBL, LOGICAL_AXIS_NAMES); MAP(_SP_N_LBL, LOGICAL_AXIS_NAMES);
 
 #endif
 
-void serial_print_P(PGM_P str) {
- while (const char c = pgm_read_byte(str++)) SERIAL_CHAR(c);
+// Specializations for float, p_float_t, w_float_t
+template <> void SERIAL_ECHO(const float f) { SERIAL_IMPL.print(f); }
+template <> void SERIAL_ECHO(const p_float_t pf) { SERIAL_IMPL.print(pf.value, pf.prec); }
+template <> void SERIAL_ECHO(const w_float_t wf) { char f1[20]; SERIAL_IMPL.print(dtostrf(wf.value, wf.width, wf.prec, f1)); }
+
+// Specializations for F-string
+template <> void SERIAL_ECHO(const FSTR_P fstr) { SERIAL_ECHO_P(FTOP(fstr)); }
+template <> void SERIAL_ECHOLN(const FSTR_P fstr) { SERIAL_ECHOLN_P(FTOP(fstr)); }
+
+void SERIAL_CHAR(char a) { SERIAL_IMPL.write(a); }
+void SERIAL_EOL() { SERIAL_CHAR('\n'); }
+
+void SERIAL_ECHO(serial_char_t x) { SERIAL_IMPL.write(x.c); }
+
+void SERIAL_FLUSH() { SERIAL_IMPL.flush(); }
+void SERIAL_FLUSHTX() { SERIAL_IMPL.flushTX(); }
+
+void SERIAL_ECHO_P(PGM_P pstr) {
+ while (const char c = pgm_read_byte(pstr++)) SERIAL_CHAR(c);
 }
+void SERIAL_ECHOLN_P(PGM_P pstr) { SERIAL_ECHO_P(pstr); SERIAL_EOL(); }
 
-void serial_echo_start() { serial_print(F("echo:")); }
-void serial_error_start() { serial_print(F("Error:")); }
+void SERIAL_ECHO_START() { SERIAL_ECHO(F("echo:")); }
+void SERIAL_ERROR_START() { SERIAL_ECHO(F("Error:")); }
 
-void serial_spaces(uint8_t count) { count *= (PROPORTIONAL_FONT_RATIO); while (count--) SERIAL_CHAR(' '); }
+void SERIAL_ECHO_SP(uint8_t count) { count *= (PROPORTIONAL_FONT_RATIO); while (count--) SERIAL_CHAR(' '); }
 
 void serial_offset(const_float_t v, const uint8_t sp/*=0*/) {
  if (v == 0 && sp == 1)
  SERIAL_CHAR(' ');
  else if (v > 0 || (v == 0 && sp == 2))
  SERIAL_CHAR('+');
- SERIAL_DECIMAL(v);
+ SERIAL_ECHO(v);
+}
+
+void serial_ternary(FSTR_P const pre, const bool onoff, FSTR_P const on, FSTR_P const off, FSTR_P const post/*=nullptr*/) {
+ if (pre) SERIAL_ECHO(pre);
+ if (onoff && on) SERIAL_ECHO(on);
+ if (!onoff && off) SERIAL_ECHO(off);
+ if (post) SERIAL_ECHO(post);
 }
 
-void serialprint_onoff(const bool onoff) { serial_print(onoff ? F(STR_ON) : F(STR_OFF)); }
+void serialprint_onoff(const bool onoff) { SERIAL_ECHO(onoff ? F(STR_ON) : F(STR_OFF)); }
 void serialprintln_onoff(const bool onoff) { serialprint_onoff(onoff); SERIAL_EOL(); }
-void serialprint_truefalse(const bool tf) { serial_print(tf ? F("true") : F("false")); }
+void serialprint_truefalse(const bool tf) { SERIAL_ECHO(tf ? F("true") : F("false")); }
 
 void print_bin(uint16_t val) {
  for (uint8_t i = 16; i--;) {
@@ -97,11 +122,11 @@ void print_bin(uint16_t val) {
 }
 
 void print_pos(NUM_AXIS_ARGS_(const_float_t) FSTR_P const prefix/*=nullptr*/, FSTR_P const suffix/*=nullptr*/) {
- if (prefix) serial_print(prefix);
+ if (prefix) SERIAL_ECHO(prefix);
  #if NUM_AXES
  SERIAL_ECHOPGM_P(
  LIST_N(DOUBLE(NUM_AXES), SP_X_STR, x, SP_Y_STR, y, SP_Z_STR, z, SP_I_STR, i, SP_J_STR, j, SP_K_STR, k, SP_U_STR, u, SP_V_STR, v, SP_W_STR, w)
  );
  #endif
- if (suffix) serial_print(suffix); else SERIAL_EOL();
+ if (suffix) SERIAL_ECHO(suffix); else SERIAL_EOL();
 }