Fix more STM32F1 Serial hangs due to overflows

Marlin/Configuration.h

@@ -2165,6 +2165,10 @@
 // Touch-screen LCD for Malyan M200/M300 printers
 //
 //#define MALYAN_LCD
+#if ENABLED(MALYAN_LCD)
+  // This will be 1 on a Malyan M200, but may differ on other boards.
+  #define MALYAN_LCD_SERIAL_PORT 1
+#endif
 
 //
 // Touch UI for FTDI EVE (FT800/FT810) displays

Marlin/src/HAL/STM32/HAL.h

@@ -43,82 +43,67 @@
 // ------------------------
 // Defines
 // ------------------------
+#define _MSERIAL(X) MSerial##X
+#define MSERIAL(X) _MSERIAL(X)
 
-#if SERIAL_PORT == 0
-  #error "SERIAL_PORT cannot be 0. (Port 0 does not exist.) Please update your configuration."
-#elif SERIAL_PORT == -1
+#if SERIAL_PORT == -1
   #define MYSERIAL0 SerialUSB
-#elif SERIAL_PORT == 1
-  #define MYSERIAL0 MSerial1
-#elif SERIAL_PORT == 2
-  #define MYSERIAL0 MSerial2
-#elif SERIAL_PORT == 3
-  #define MYSERIAL0 MSerial3
-#elif SERIAL_PORT == 4
-  #define MYSERIAL0 MSerial4
-#elif SERIAL_PORT == 5
-  #define MYSERIAL0 MSerial5
-#elif SERIAL_PORT == 6
-  #define MYSERIAL0 MSerial6
+#elif WITHIN(SERIAL_PORT, 1, 6)
+  #define MYSERIAL0 MSERIAL(SERIAL_PORT)
 #else
-  #error "SERIAL_PORT must be from -1 to 6. Please update your configuration."
+  #error "SERIAL_PORT must be -1 or from 1 to 6. Please update your configuration."
 #endif
 
 #ifdef SERIAL_PORT_2
   #define NUM_SERIAL 2
-  #if SERIAL_PORT_2 == 0
-    #error "SERIAL_PORT_2 cannot be 0. (Port 0 does not exist.) Please update your configuration."
-  #elif SERIAL_PORT_2 == SERIAL_PORT
+  #if SERIAL_PORT_2 == SERIAL_PORT
     #error "SERIAL_PORT_2 must be different than SERIAL_PORT. Please update your configuration."
   #elif SERIAL_PORT_2 == -1
     #define MYSERIAL1 SerialUSB
-  #elif SERIAL_PORT_2 == 1
-    #define MYSERIAL1 MSerial1
-  #elif SERIAL_PORT_2 == 2
-    #define MYSERIAL1 MSerial2
-  #elif SERIAL_PORT_2 == 3
-    #define MYSERIAL1 MSerial3
-  #elif SERIAL_PORT_2 == 4
-    #define MYSERIAL1 MSerial4
-  #elif SERIAL_PORT_2 == 5
-    #define MYSERIAL1 MSerial5
-  #elif SERIAL_PORT_2 == 6
-    #define MYSERIAL1 MSerial6
+  #elif WITHIN(SERIAL_PORT_2, 1, 6)
+    #define MYSERIAL1 MSERIAL(SERIAL_PORT_2)
   #else
-    #error "SERIAL_PORT_2 must be from -1 to 6. Please update your configuration."
+    #error "SERIAL_PORT_2 must be -1 or from 1 to 6. Please update your configuration."
   #endif
 #else
   #define NUM_SERIAL 1
 #endif
 
+
 #if HAS_DGUS_LCD
-  #if DGUS_SERIAL_PORT == 0
-    #error "DGUS_SERIAL_PORT cannot be 0. (Port 0 does not exist.) Please update your configuration."
-  #elif DGUS_SERIAL_PORT == SERIAL_PORT
+  #if DGUS_SERIAL_PORT == SERIAL_PORT
     #error "DGUS_SERIAL_PORT must be different than SERIAL_PORT. Please update your configuration."
   #elif defined(SERIAL_PORT_2) && DGUS_SERIAL_PORT == SERIAL_PORT_2
     #error "DGUS_SERIAL_PORT must be different than SERIAL_PORT_2. Please update your configuration."
   #elif DGUS_SERIAL_PORT == -1
     #define DGUS_SERIAL SerialUSB
-  #elif DGUS_SERIAL_PORT == 1
-    #define DGUS_SERIAL MSerial1
-  #elif DGUS_SERIAL_PORT == 2
-    #define DGUS_SERIAL MSerial2
-  #elif DGUS_SERIAL_PORT == 3
-    #define DGUS_SERIAL MSerial3
-  #elif DGUS_SERIAL_PORT == 4
-    #define DGUS_SERIAL MSerial4
-  #elif DGUS_SERIAL_PORT == 5
-    #define DGUS_SERIAL MSerial5
-  #elif DGUS_SERIAL_PORT == 6
-    #define DGUS_SERIAL MSerial6
+  #elif WITHIN(DGUS_SERIAL_PORT, 1, 6)
+    #define DGUS_SERIAL MSERIAL(DGUS_SERIAL_PORT)
   #else
-    #error "DGUS_SERIAL_PORT must be from -1 to 6. Please update your configuration."
+    #error "DGUS_SERIAL must be -1 or from 1 to 6. Please update your configuration."
   #endif
 
   #define DGUS_SERIAL_GET_TX_BUFFER_FREE DGUS_SERIAL.availableForWrite
 #endif
 
+#ifdef MALYAN_LCD
+  #define _FRAMEWORK_SERIAL(X) Serial##X
+  #define FRAMEWORK_SERIAL(X) _FRAMEWORK_SERIAL(X)
+
+  #ifndef MALYAN_LCD_SERIAL_PORT
+    #error "MALYAN_LCD requires MALYAN_LCD_SERIAL_PORT to be defined in Configuration.h"
+  #elif MALYAN_LCD_SERIAL_PORT == SERIAL_PORT
+    #error "MALYAN_LCD_SERIAL_PORT must be different than SERIAL_PORT. Please update your configuration."
+  #elif defined(SERIAL_PORT_2) && MALYAN_LCD_SERIAL_PORT == SERIAL_PORT_2
+    #error "MALYAN_LCD_SERIAL_PORT must be different than SERIAL_PORT_2. Please update your configuration."
+  #elif defined(DGUS_SERIAL) && MALYAN_LCD_SERIAL_PORT == DGUS_SERIAL_PORT
+    #error "MALYAN_LCD_SERIAL_PORT must be different than DGUS_SERIAL_PORT. Please update your configuration."
+  #elif WITHIN(MALYAN_LCD_SERIAL_PORT, 1, 6)
+    #define MALYAN_LCD_SERIAL FRAMEWORK_SERIAL(MALYAN_LCD_SERIAL_PORT)
+  #else
+    #error "MALYAN_LCD_SERIAL_PORT must be from 1 to 6. Please update your configuration."
+  #endif
+#endif
 
 /**
  * TODO: review this to return 1 for pins that are not analog input

Marlin/src/HAL/STM32F1/HAL.h

@@ -68,73 +68,75 @@
   #endif
 #endif
 
-#if SERIAL_PORT == 0
-  #error "SERIAL_PORT cannot be 0. (Port 0 does not exist.) Please update your configuration."
-#elif SERIAL_PORT == -1
+#define _MSERIAL(X) MSerial##X
+#define MSERIAL(X) _MSERIAL(X)
+
+#if defined(STM32_HIGH_DENSITY) || defined(STM32_XL_DENSITY)
+  #define NUM_UARTS 5
+#else
+  #define NUM_UARTS 3
+#endif
+
+#if SERIAL_PORT == -1
   #define MYSERIAL0 UsbSerial
-#elif SERIAL_PORT == 1
-  #define MYSERIAL0 MSerial1
-#elif SERIAL_PORT == 2
-  #define MYSERIAL0 MSerial2
-#elif SERIAL_PORT == 3
-  #define MYSERIAL0 MSerial3
-#elif SERIAL_PORT == 4
-  #define MYSERIAL0 MSerial4
-#elif SERIAL_PORT == 5
-  #define MYSERIAL0 MSerial5
+#elif WITHIN(SERIAL_PORT, 1, NUM_UARTS)
+  #define MYSERIAL0 MSERIAL(SERIAL_PORT)
+#elif defined(STM32_HIGH_DENSITY) || defined(STM32_XL_DENSITY)
+  #error "SERIAL_PORT must be -1 or from 1 to 5. Please update your configuration."
 #else
-  #error "SERIAL_PORT must be from -1 to 5. Please update your configuration."
+  #error "SERIAL_PORT must be -1 or from 1 to 3. Please update your configuration."
 #endif
 
 #ifdef SERIAL_PORT_2
-  #if SERIAL_PORT_2 == 0
-    #error "SERIAL_PORT_2 cannot be 0. (Port 0 does not exist.) Please update your configuration."
-  #elif SERIAL_PORT_2 == SERIAL_PORT
+  #if SERIAL_PORT_2 == SERIAL_PORT
     #error "SERIAL_PORT_2 must be different than SERIAL_PORT. Please update your configuration."
   #elif SERIAL_PORT_2 == -1
     #define MYSERIAL1 UsbSerial
-  #elif SERIAL_PORT_2 == 1
-    #define MYSERIAL1 MSerial1
-  #elif SERIAL_PORT_2 == 2
-    #define MYSERIAL1 MSerial2
-  #elif SERIAL_PORT_2 == 3
-    #define MYSERIAL1 MSerial3
-  #elif SERIAL_PORT_2 == 4
-    #define MYSERIAL1 MSerial4
-  #elif SERIAL_PORT_2 == 5
-    #define MYSERIAL1 MSerial5
+  #elif WITHIN(SERIAL_PORT_2, 1, NUM_UARTS)
+    #define MYSERIAL1 MSERIAL(SERIAL_PORT_2)
+  #elif defined(STM32_HIGH_DENSITY) || defined(STM32_XL_DENSITY)
+    #error "SERIAL_PORT_2 must be -1 or from 1 to 5. Please update your configuration."
   #else
-    #error "SERIAL_PORT_2 must be from -1 to 5. Please update your configuration."
+    #error "SERIAL_PORT_2 must be -1 or from 1 to 3. Please update your configuration."
   #endif
   #define NUM_SERIAL 2
 #else
   #define NUM_SERIAL 1
 #endif
 
 #ifdef DGUS_SERIAL
-  #if DGUS_SERIAL_PORT == 0
-    #error "DGUS_SERIAL_PORT cannot be 0. (Port 0 does not exist.) Please update your configuration."
-  #elif DGUS_SERIAL_PORT == SERIAL_PORT
+  #if DGUS_SERIAL_PORT == SERIAL_PORT
     #error "DGUS_SERIAL_PORT must be different than SERIAL_PORT. Please update your configuration."
   #elif defined(SERIAL_PORT_2) && DGUS_SERIAL_PORT == SERIAL_PORT_2
     #error "DGUS_SERIAL_PORT must be different than SERIAL_PORT_2. Please update your configuration."
   #elif DGUS_SERIAL_PORT == -1
     #define DGUS_SERIAL UsbSerial
-  #elif DGUS_SERIAL_PORT == 1
-    #define DGUS_SERIAL MSerial1
-  #elif DGUS_SERIAL_PORT == 2
-    #define DGUS_SERIAL MSerial2
-  #elif DGUS_SERIAL_PORT == 3
-    #define DGUS_SERIAL MSerial3
-  #elif DGUS_SERIAL_PORT == 4
-    #define DGUS_SERIAL MSerial4
-  #elif DGUS_SERIAL_PORT == 5
-    #define DGUS_SERIAL MSerial5
+  #elif WITHIN(DGUS_SERIAL_PORT, 1, NUM_UARTS)
+    #define DGUS_SERIAL MSERIAL(DGUS_SERIAL_PORT)
+  #elif defined(STM32_HIGH_DENSITY) || defined(STM32_XL_DENSITY)
+    #error "DGUS_SERIAL must be -1 or from 1 to 5. Please update your configuration."
   #else
-    #error "DGUS_SERIAL_PORT must be from -1 to 5. Please update your configuration."
+    #error "DGUS_SERIAL must be -1 or from 1 to 3. Please update your configuration."
   #endif
 #endif
 
+#ifdef MALYAN_LCD
+  #ifndef MALYAN_LCD_SERIAL_PORT
+    #error "MALYAN_LCD requires MALYAN_LCD_SERIAL_PORT to be defined in Configuration.h"
+  #elif MALYAN_LCD_SERIAL_PORT == SERIAL_PORT
+    #error "MALYAN_LCD_SERIAL_PORT must be different than SERIAL_PORT. Please update your configuration."
+  #elif defined(SERIAL_PORT_2) && MALYAN_LCD_SERIAL_PORT == SERIAL_PORT_2
+    #error "MALYAN_LCD_SERIAL_PORT must be different than SERIAL_PORT_2. Please update your configuration."
+  #elif defined(DGUS_SERIAL) && MALYAN_LCD_SERIAL_PORT == DGUS_SERIAL_PORT
+    #error "MALYAN_LCD_SERIAL_PORT must be different than DGUS_SERIAL_PORT. Please update your configuration."
+  #elif WITHIN(MALYAN_LCD_SERIAL_PORT, 1, NUM_UARTS)
+    #define MALYAN_LCD_SERIAL MSERIAL(MALYAN_LCD_SERIAL_PORT)
+  #elif defined(STM32_HIGH_DENSITY) || defined(STM32_XL_DENSITY)
+    #error "MALYAN_LCD_SERIAL_PORT must be from 1 to 5. Please update your configuration."
+  #else
+    #error "MALYAN_LCD_SERIAL_PORT must be from 1 to 3. Please update your configuration."
+  #endif
+#endif
 
 // Set interrupt grouping for this MCU
 void HAL_init();