Minor serial code cleanup

Marlin/src/HAL/AVR/MarlinSerial.cpp

@@ -566,7 +566,7 @@ ISR(SERIAL_REGNAME(USART, SERIAL_PORT, _UDRE_vect)) {
   MarlinSerial<MarlinSerialCfg<SERIAL_PORT>>::_tx_udr_empty_irq();
 }
 
-// Because of the template definition above, it's required to instantiate the template to have all method generated
+// Because of the template definition above, it's required to instantiate the template to have all methods generated
 template class MarlinSerial< MarlinSerialCfg<SERIAL_PORT> >;
 MSerialT customizedSerial1(MSerialT::HasEmergencyParser);
 

Marlin/src/core/serial.h

@@ -62,6 +62,7 @@ typedef int8_t serial_index_t;
 #define SERIAL_ALL 0x7F
 #if HAS_MULTI_SERIAL
   #define _PORT_REDIRECT(n,p)   REMEMBER(n,multiSerial.portMask,p)
+  #define _PORT_RESTORE(n,p)    RESTORE(n)
   #define SERIAL_ASSERT(P)      if(multiSerial.portMask!=(P)){ debugger(); }
   #ifdef SERIAL_CATCHALL
     typedef MultiSerial<decltype(MYSERIAL), decltype(SERIAL_CATCHALL), 0> SerialOutputT;
@@ -72,6 +73,7 @@ typedef int8_t serial_index_t;
   #define SERIAL_IMPL           multiSerial
 #else
   #define _PORT_REDIRECT(n,p)   NOOP
+  #define _PORT_RESTORE(n)      NOOP
   #define SERIAL_ASSERT(P)      NOOP
   #define SERIAL_IMPL           MYSERIAL0
 #endif
@@ -79,6 +81,7 @@ typedef int8_t serial_index_t;
 #define SERIAL_OUT(WHAT, V...)  (void)SERIAL_IMPL.WHAT(V)
 
 #define PORT_REDIRECT(p)        _PORT_REDIRECT(1,p)
+#define PORT_RESTORE()          _PORT_RESTORE(1)
 #define SERIAL_PORTMASK(P)      _BV(P)
 
 //

Marlin/src/core/serial_base.h

@@ -29,7 +29,7 @@
 #endif
 
 // flushTX is not implemented in all HAL, so use SFINAE to call the method where it is.
-CALL_IF_EXISTS_IMPL(void, flushTX );
+CALL_IF_EXISTS_IMPL(void, flushTX);
 CALL_IF_EXISTS_IMPL(bool, connected, true);
 
 // In order to catch usage errors in code, we make the base to encode number explicit
@@ -42,14 +42,14 @@ enum class PrintBase {
   Bin = 2
 };
 
-// A simple forward struct that prevent the compiler to select print(double, int) as a default overload for any type different than 
+// A simple forward struct that prevent the compiler to select print(double, int) as a default overload for any type different than
 // double or float. For double or float, a conversion exists so the call will be transparent
 struct EnsureDouble {
   double a;
   FORCE_INLINE operator double() { return a; }
   // If the compiler breaks on ambiguity here, it's likely because you're calling print(X, base) with X not a double or a float, and a
   // base that's not one of PrintBase's value. This exact code is made to detect such error, you NEED to set a base explicitely like this:
-  // SERIAL_PRINT(v, PrintBase::Hex) 
+  // SERIAL_PRINT(v, PrintBase::Hex)
   FORCE_INLINE EnsureDouble(double a) : a(a) {}
   FORCE_INLINE EnsureDouble(float a) : a(a) {}
 };
@@ -147,13 +147,13 @@ struct SerialBase {
     else write('0');
   }
   void printNumber(signed long n, const uint8_t base) {
-    if (base == 10 && n < 0) { 
+    if (base == 10 && n < 0) {
       n = -n; // This works because all platforms Marlin's builds on are using 2-complement encoding for negative number
               // On such CPU, changing the sign of a number is done by inverting the bits and adding one, so if n = 0x80000000 = -2147483648 then
               // -n = 0x7FFFFFFF + 1 => 0x80000000 = 2147483648 (if interpreted as unsigned) or -2147483648 if interpreted as signed.
               // On non 2-complement CPU, there would be no possible representation for 2147483648.
-      write('-'); 
-    } 
+      write('-');
+    }
     printNumber((unsigned long)n , base);
   }
 

Marlin/src/gcode/host/M118.cpp

@@ -53,14 +53,10 @@ void GcodeSuite::M118() {
   }
 
   #if HAS_MULTI_SERIAL
-    const int8_t old_serial = multiSerial.portMask;
-    if (WITHIN(port, 0, NUM_SERIAL))
-      multiSerial.portMask = port ? _BV(port - 1) : SERIAL_ALL;
+    PORT_REDIRECT(WITHIN(port, 0, NUM_SERIAL) ? (port ? _BV(port - 1) : SERIAL_ALL) : multiSerial.portMask);
   #endif
 
   if (hasE) SERIAL_ECHO_START();
   if (hasA) SERIAL_ECHOPGM("//");
   SERIAL_ECHOLN(p);
-
-  TERN_(HAS_MULTI_SERIAL, multiSerial.portMask = old_serial);
 }

Marlin/src/libs/autoreport.h

@@ -42,8 +42,9 @@ struct AutoReporter {
     const millis_t ms = millis();
     if (ELAPSED(ms, next_report_ms)) {
       next_report_ms = ms + SEC_TO_MS(report_interval);
-      TERN_(HAS_MULTI_SERIAL, PORT_REDIRECT(report_port_mask));
+      PORT_REDIRECT(report_port_mask);
       Helper::report();
+      //PORT_RESTORE();
     }
   }
 };