Fix conditional compilation usage for serial ports

Author: ppescher

cores/arduino/HardwareSerial.cpp

@@ -33,7 +33,7 @@
 #if defined(HAL_UART_MODULE_ENABLED)
 #if defined(HAVE_HWSERIAL1) || defined(HAVE_HWSERIAL2) || defined(HAVE_HWSERIAL3) ||\
     defined(HAVE_HWSERIAL4) || defined(HAVE_HWSERIAL5) || defined(HAVE_HWSERIAL6) ||\
-    defined(HAVE_HWSERIAL7) || defined(HAVE_HWSERIAL8) || defined(HAVE_HWSERIAL8) ||\
+    defined(HAVE_HWSERIAL7) || defined(HAVE_HWSERIAL8) || defined(HAVE_HWSERIAL9) ||\
     defined(HAVE_HWSERIAL10) || defined(HAVE_HWSERIALLP1)
 // SerialEvent functions are weak, so when the user doesn't define them,
 // the linker just sets their address to 0 (which is checked below).
@@ -358,7 +358,7 @@ void HardwareSerial::flush()
 
   while((_serial.tx_head != _serial.tx_tail)) {
     // nop, the interrupt handler will free up space for us
-	__WFI();
+    __WFI();
   }
   // If we get here, nothing is queued anymore (DRIE is disabled) and
   // the hardware finished tranmission (TXC is set).
@@ -374,7 +374,7 @@ size_t HardwareSerial::write(uint8_t c)
   // wait for the interrupt handler to empty it a bit
   while (i == _serial.tx_tail) {
     // nop, the interrupt handler will free up space for us
-	__WFI();
+    __WFI();
   }
 
   _serial.tx_buff[_serial.tx_head] = c;

cores/arduino/stm32/uart.c

@@ -466,7 +466,7 @@ void uart_deinit(serial_t *obj)
         __HAL_RCC_UART9_CLK_DISABLE();
         break;
 #endif
-#if defined(HAVE_HWSERIAL9)
+#if defined(HAVE_HWSERIAL10)
     case 9:
         __HAL_RCC_UART10_FORCE_RESET();
         __HAL_RCC_UART10_RELEASE_RESET();
@@ -901,18 +901,18 @@ void USART3_IRQHandler(void)
 #endif
 #if defined(STM32F0xx)
 /* USART3_4_IRQn */
-#if defined(ENABLE_HWSERIAL3)
+#if defined(ENABLE_HWSERIAL4)
   if(uart_handlers[3] != NULL) {
     HAL_UART_IRQHandler(uart_handlers[3]);
   }
 #endif
 #if defined(STM32F030xC)
-#if defined(ENABLE_HWSERIAL4)
+#if defined(ENABLE_HWSERIAL5)
   if(uart_handlers[4] != NULL) {
     HAL_UART_IRQHandler(uart_handlers[4]);
   }
 #endif
-#if defined(ENABLE_HWSERIAL5)
+#if defined(ENABLE_HWSERIAL6)
   if(uart_handlers[5] != NULL) {
     HAL_UART_IRQHandler(uart_handlers[5]);
   }