Update SPRACINGF3MINI and LUX_RACE targets for changes made in USART4/5

support. Fix two more issues missed in previous merge of uart45 branch.
NOS-Copter · Feb 20, 2016 · b5a455d · b5a455d
1 parent 1efd1d6
commit b5a455d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/src/main/config/config.c b/src/main/config/config.c
@@ -768,7 +768,7 @@ void validateAndFixConfig(void)
     }
 #endif
 
-#if defined(CC3D) && defined(DISPLAY) && defined(USE_USART3)
+#if defined(CC3D) && defined(DISPLAY) && defined(USE_UART3)
     if (doesConfigurationUsePort(SERIAL_PORT_USART3) && featureConfigured(FEATURE_DISPLAY)) {
         featureClear(FEATURE_DISPLAY);
     }

diff --git a/src/main/target/LUX_RACE/target.h b/src/main/target/LUX_RACE/target.h
@@ -76,9 +76,9 @@
 #define USB_IO
 
 #define USE_VCP
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define SERIAL_PORT_COUNT 4
 
 #define UART1_TX_PIN        GPIO_Pin_4

diff --git a/src/main/target/SPRACINGF3MINI/target.h b/src/main/target/SPRACINGF3MINI/target.h
@@ -75,9 +75,9 @@
 #define USB_DETECT_GPIO_CLK              RCC_AHBPeriph_GPIOC
 
 #define USE_VCP
-#define USE_USART1
-#define USE_USART2
-#define USE_USART3
+#define USE_UART1
+#define USE_UART2
+#define USE_UART3
 #define USE_SOFTSERIAL1
 #define SERIAL_PORT_COUNT 5
 

diff --git a/src/test/unit/config_unittest.cc b/src/test/unit/config_unittest.cc
@@ -181,14 +181,14 @@ const serialPortIdentifier_e serialPortIdentifiers[SERIAL_PORT_COUNT] = {
 #ifdef USE_VCP
     SERIAL_PORT_USB_VCP,
 #endif
-#ifdef USE_USART1
-    SERIAL_PORT_USART1,
+#ifdef USE_UART1
+    SERIAL_PORT_UART1,
 #endif
-#ifdef USE_USART2
-    SERIAL_PORT_USART2,
+#ifdef USE_UART2
+    SERIAL_PORT_UART2,
 #endif
-#ifdef USE_USART3
-    SERIAL_PORT_USART3,
+#ifdef USE_UART3
+    SERIAL_PORT_UART3,
 #endif
 #ifdef USE_SOFTSERIAL1
     SERIAL_PORT_SOFTSERIAL1,