Review UART_DEBUG definition

fpistm · fpistm · commit f3f8809d3698 · 2017-10-06T10:29:32.000+02:00
By default, UART_DEBUG is linked to Serial generic instance.
So it is not required to define it.
It could be redefined in the variant.h to print on another
instance than Serial

Signed-off-by: Frederic.Pillon &lt;frederic.pillon@st.com&gt;
diff --git a/cores/arduino/stm32/uart.c b/cores/arduino/stm32/uart.c
@@ -54,6 +54,15 @@
  extern "C" {
 #endif
 
+// if DEBUG_UART is not defined assume this is the one
+// linked to PIN_SERIAL_TX
+#if !defined(DEBUG_UART)
+#if defined(PIN_SERIAL_TX)
+#define DEBUG_UART pinmap_peripheral(digitalPinToPinName(PIN_SERIAL_TX), PinMap_UART_TX)
+#else
+#define DEBUG_UART NP
+#endif
+#endif
 // @brief uart caracteristics
 #if defined(STM32F4xx)
 #define UART_NUM (10)
@@ -398,11 +407,11 @@ size_t uart_write(serial_t *obj, uint8_t data, uint16_t size)
 size_t uart_debug_write(uint8_t *data, uint32_t size)
 {
   uint8_t index = 0;
+  USART_TypeDef* dbg_uart = DEBUG_UART;
   uint32_t tickstart = HAL_GetTick();
-
   for(index = 0; index < UART_NUM; index++) {
     if(uart_handlers[index] != NULL) {
-      if(DEBUG_UART == uart_handlers[index]->Instance) {
+      if(dbg_uart == uart_handlers[index]->Instance) {
         break;
       }
     }
diff --git a/variants/DISCO_F100RB/variant.h b/variants/DISCO_F100RB/variant.h
@@ -153,8 +153,6 @@ enum {
 #define TIMER_SERVO             TIM17  //TODO: advanced-control timers don't work
 
 // UART Definitions
-#define DEBUG_UART              ((USART_TypeDef *) USART2)
-
 // Default pin used for 'Serial' instance (ex: ST-Link)
 // Mandatory for Firmata
 #define PIN_SERIAL_RX           8
diff --git a/variants/DISCO_F407VG/variant.h b/variants/DISCO_F407VG/variant.h
@@ -178,8 +178,6 @@ enum {
 #define TIMER_UART_EMULATED     TIM6
 
 // UART Definitions
-#define DEBUG_UART              ((USART_TypeDef *) USART2)
-
 // UART Emulation
 #define UART_EMUL_RX            PE_9
 #define UART_EMUL_TX            PE_11
diff --git a/variants/DISCO_F746NG/variant.h b/variants/DISCO_F746NG/variant.h
@@ -110,8 +110,6 @@ enum {
 #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
 // UART Definitions
-#define DEBUG_UART              ((USART_TypeDef *) USART1)
-
 // Default pin used for 'Serial' instance (ex: ST-Link)
 // Mandatory for Firmata
 #define PIN_SERIAL_RX           PB7
diff --git a/variants/DISCO_L475VG_IOT/variant.h b/variants/DISCO_L475VG_IOT/variant.h
@@ -180,8 +180,6 @@ enum {
 #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
 // UART Definitions
-#define DEBUG_UART              ((USART_TypeDef *) USART1)
-
 // Default pin used for 'Serial' instance (ex: ST-Link)
 // Mandatory for Firmata
 #define PIN_SERIAL_RX           0
diff --git a/variants/NUCLEO_F030R8/variant.h b/variants/NUCLEO_F030R8/variant.h
@@ -151,8 +151,6 @@ enum {
 #define TIMER_SERVO             TIM3  //TODO: advanced-control timers don't work
 
 // UART Definitions
-#define DEBUG_UART              ((USART_TypeDef *) USART2)
-
 // Default pin used for 'Serial' instance (ex: ST-Link)
 // Mandatory for Firmata
 #define PIN_SERIAL_RX           0
diff --git a/variants/NUCLEO_F091RC/variant.h b/variants/NUCLEO_F091RC/variant.h
@@ -150,8 +150,6 @@ enum {
 #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
 // UART Definitions
-#define DEBUG_UART              ((USART_TypeDef *) USART2)
-
 // UART Emulation
 #define UART_EMUL_RX            PB_14
 #define UART_EMUL_TX            PB_13
diff --git a/variants/NUCLEO_F103RB/variant.h b/variants/NUCLEO_F103RB/variant.h
@@ -150,8 +150,6 @@ enum {
 #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
 // UART Definitions
-#define DEBUG_UART              ((USART_TypeDef *) USART2)
-
 // Default pin used for 'Serial' instance (ex: ST-Link)
 // Mandatory for Firmata
 #define PIN_SERIAL_RX           0
diff --git a/variants/NUCLEO_F207ZG/variant.h b/variants/NUCLEO_F207ZG/variant.h
@@ -195,8 +195,6 @@ enum {
 #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
 // UART Definitions
-#define DEBUG_UART              ((USART_TypeDef *) USART3)
-
 // Default pin used for 'Serial' instance (ex: ST-Link)
 // Mandatory for Firmata
 #define PIN_SERIAL_RX           PD9
diff --git a/variants/NUCLEO_F303RE/variant.h b/variants/NUCLEO_F303RE/variant.h
@@ -150,8 +150,6 @@ enum {
 #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
 // UART Definitions
-#define DEBUG_UART              ((USART_TypeDef *) USART2)
-
 // UART Emulation
 #define UART_EMUL_RX            PC_1
 #define UART_EMUL_TX            PC_3
diff --git a/variants/NUCLEO_F401RE/variant.h b/variants/NUCLEO_F401RE/variant.h
@@ -151,8 +151,6 @@ enum {
 #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
 // UART Definitions
-#define DEBUG_UART              ((USART_TypeDef *) USART2)
-
 // UART Emulation
 #define UART_EMUL_RX            PC_1
 #define UART_EMUL_TX            PC_3
diff --git a/variants/NUCLEO_F411RE/variant.h b/variants/NUCLEO_F411RE/variant.h
@@ -151,8 +151,6 @@ enum {
 #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
 // UART Definitions
-#define DEBUG_UART              ((USART_TypeDef *) USART2)
-
 // Default pin used for 'Serial' instance (ex: ST-Link)
 // Mandatory for Firmata
 #define PIN_SERIAL_RX           0
diff --git a/variants/NUCLEO_F429ZI/variant.h b/variants/NUCLEO_F429ZI/variant.h
@@ -185,8 +185,6 @@ enum {
 #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
 // UART Definitions
-#define DEBUG_UART              ((USART_TypeDef *) USART3)
-
 // UART Emulation
 #define UART_EMUL_RX            PF_15
 #define UART_EMUL_TX            PE_13
diff --git a/variants/NUCLEO_L053R8/variant.h b/variants/NUCLEO_L053R8/variant.h
@@ -150,8 +150,6 @@ enum {
 #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
 // UART Definitions
-#define DEBUG_UART              ((USART_TypeDef *) USART2)
-
 // Default pin used for 'Serial' instance (ex: ST-Link)
 // Mandatory for Firmata
 #define PIN_SERIAL_RX           0
diff --git a/variants/NUCLEO_L152RE/variant.h b/variants/NUCLEO_L152RE/variant.h
@@ -155,8 +155,6 @@ enum {
 #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
 // UART Definitions
-#define DEBUG_UART              ((USART_TypeDef *) USART2)
-
 // Default pin used for 'Serial' instance (ex: ST-Link)
 // Mandatory for Firmata
 #define PIN_SERIAL_RX           0
diff --git a/variants/NUCLEO_L432KC/variant.h b/variants/NUCLEO_L432KC/variant.h
@@ -104,8 +104,6 @@ enum {
 #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
 // UART Definitions
-#define DEBUG_UART              ((USART_TypeDef *) USART2)
-
 // Default pin used for 'Serial' instance (ex: ST-Link)
 // Mandatory for Firmata
 #define PIN_SERIAL_RX           PA15
diff --git a/variants/NUCLEO_L476RG/variant.h b/variants/NUCLEO_L476RG/variant.h
@@ -150,8 +150,6 @@ enum {
 #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 
 // UART Definitions
-#define DEBUG_UART              ((USART_TypeDef *) USART2)
-
 // UART Emulation
 #define UART_EMUL_RX            PB_13
 #define UART_EMUL_TX            PB_14
diff --git a/variants/board_template/variant.h b/variants/board_template/variant.h
@@ -107,7 +107,8 @@ enum {
 #define TIMER_SERVO             TIMx  //TODO: advanced-control timers don't work
 
 // UART Definitions
-#define DEBUG_UART              ((USART_TypeDef *) U(S)ARTX) // ex: USART3
+// DEBUG_UART could be redefined to print on another instance than 'Serial'
+//#define DEBUG_UART              ((USART_TypeDef *) U(S)ARTX) // ex: USART3
 
 // UART Emulation (uncomment if needed, required TIM1)
 //#define UART_EMUL_RX            PX_n // PinName used for RX
