FIX-91 No all Serial objects created (openwch#91)

michpro · May 13, 2024 · c6c920d · c6c920d
1 parent c40c5c8
commit c6c920d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 33 deletions.
diff --git a/cores/arduino/HardwareSerial.cpp b/cores/arduino/HardwareSerial.cpp
@@ -272,7 +272,7 @@ void HardwareSerial::setHandler(void *handler)
   #endif
 
   #if defined(HAVE_HWSERIAL6)
-    HardwareSerial Serial6(USART6);
+    HardwareSerial Serial6(UART6);
   #endif
 
   #if defined(HAVE_HWSERIAL7)

diff --git a/cores/arduino/WSerial.h b/cores/arduino/WSerial.h
@@ -67,45 +67,29 @@
   #endif /* !HWSERIAL_NONE && SERIAL_UART_INSTANCE */
 
 
-  #if defined(ENABLE_HWSERIAL1)
-    #if defined(USART1_BASE)
-      #define HAVE_HWSERIAL1
-    #endif
+  #if defined(USART1_BASE)
+    #define HAVE_HWSERIAL1
   #endif
-  #if defined(ENABLE_HWSERIAL2)
-    #if defined(USART2_BASE)
-      #define HAVE_HWSERIAL2
-    #endif
+  #if defined(USART2_BASE)
+    #define HAVE_HWSERIAL2
   #endif
-  #if defined(ENABLE_HWSERIAL3)
-    #if defined(USART3_BASE)
-      #define HAVE_HWSERIAL3
-    #endif
+  #if defined(USART3_BASE)
+    #define HAVE_HWSERIAL3
   #endif
-  #if defined(ENABLE_HWSERIAL4)
-    #if defined(USART4_BASE) || defined(UART4_BASE)
-      #define HAVE_HWSERIAL4
-    #endif
+  #if defined(USART4_BASE) || defined(UART4_BASE)
+    #define HAVE_HWSERIAL4
   #endif
-  #if defined(ENABLE_HWSERIAL5)
-    #if defined(UART5_BASE)
-      #define HAVE_HWSERIAL5
-    #endif
+  #if defined(UART5_BASE)
+    #define HAVE_HWSERIAL5
   #endif
-  #if defined(ENABLE_HWSERIAL6)
-    #if defined(UART6_BASE)
-      #define HAVE_HWSERIAL6
-    #endif
+  #if defined(UART6_BASE)
+    #define HAVE_HWSERIAL6
   #endif
-  #if defined(ENABLE_HWSERIAL7)
-    #if defined(UART7_BASE)
-      #define HAVE_HWSERIAL7
-    #endif
+  #if defined(UART7_BASE)
+    #define HAVE_HWSERIAL7
   #endif
-  #if defined(ENABLE_HWSERIAL8)
-    #if defined(UART8_BASE)
-      #define HAVE_HWSERIAL8
-    #endif
+  #if defined(UART8_BASE)
+    #define HAVE_HWSERIAL8
   #endif
 
 #endif