Merge pull request #6904 from jflyper/bfdev-better-handling-of-USE_UART-and-USE_INVERTER

Better handling of USE_UART and USE_INVERTER

src/main/drivers/inverter.c

@@ -23,6 +23,8 @@
 
 #include "platform.h"
 
+#ifdef USE_INVERTER
+
 #include "io/serial.h" // For SERIAL_PORT_IDENTIFIER_TO_INDEX
 #include "drivers/io.h"
 #include "drivers/serial.h"
@@ -32,8 +34,6 @@
 
 #include "inverter.h"
 
-#ifdef USE_INVERTER
-
 static const serialPinConfig_t *pSerialPinConfig;
 
 static void inverterSet(int identifier, bool on)

src/main/drivers/inverter.h

@@ -20,10 +20,6 @@
 
 #pragma once
 
-#if defined(INVERTER_PIN_UART1) || defined(INVERTER_PIN_UART2) || defined(INVERTER_PIN_UART3) || defined(INVERTER_PIN_UART4) || defined(INVERTER_PIN_UART5) || defined(INVERTER_PIN_UART6)
-#define USE_INVERTER
-#endif
-
 #include "drivers/serial.h"
 
 void initInverters(const serialPinConfig_t *serialPinConfigToUse);

src/main/drivers/serial_pinconfig.c

@@ -24,6 +24,8 @@
 
 #include "platform.h"
 
+#ifdef USE_UART
+
 #include "build/build_config.h"
 
 #include "io/serial.h"
@@ -273,3 +275,4 @@ void pgResetFn_serialPinConfig(serialPinConfig_t *serialPinConfig)
     }
 }
 #endif
+#endif

src/main/drivers/serial_uart.c

@@ -30,6 +30,8 @@
 
 #include "platform.h"
 
+#ifdef USE_UART
+
 #include "build/build_config.h"
 #include "build/atomic.h"
 
@@ -356,3 +358,4 @@ void UART8_IRQHandler(void)
     uartIrqHandler(s);
 }
 #endif
+#endif

src/main/drivers/serial_uart.h

@@ -27,10 +27,6 @@
 // Various serial routines return the buffer occupied size as uint8_t which would need to be extended in order to
 // increase size further.
 
-#if defined(USE_UART1) || defined(USE_UART2) || defined(USE_UART3) || defined(USE_UART4) || defined(USE_UART5) || defined(USE_UART6) || defined(USE_UART7) || defined(USE_UART8)
-#define USE_UART
-#endif
-
 typedef enum {
     UARTDEV_1 = 0,
     UARTDEV_2 = 1,

src/main/drivers/serial_uart_hal.c

@@ -30,6 +30,8 @@
 
 #include "platform.h"
 
+#ifdef USE_UART
+
 #include "build/build_config.h"
 
 #include "common/utils.h"
@@ -444,3 +446,4 @@ void UART8_IRQHandler(void)
     uartIrqHandler(s);
 }
 #endif
+#endif

src/main/drivers/serial_uart_init.c

@@ -34,6 +34,8 @@
 
 #include "platform.h"
 
+#ifdef USE_UART
+
 #include "build/build_config.h"
 
 #include "common/utils.h"
@@ -245,3 +247,4 @@ serialPort_t *uartOpen(UARTDevice_e device, serialReceiveCallbackPtr rxCallback,
 
     return (serialPort_t *)s;
 }
+#endif

src/main/drivers/serial_uart_pinconfig.c

@@ -32,6 +32,8 @@
 
 #include "platform.h"
 
+#ifdef USE_UART
+
 #include "build/build_config.h"
 
 #include "drivers/rcc.h"
@@ -67,3 +69,4 @@ void uartPinConfigure(const serialPinConfig_t *pSerialPinConfig)
         }
     }
 }
+#endif

src/main/drivers/serial_uart_stm32f10x.c

@@ -31,6 +31,8 @@
 
 #include "platform.h"
 
+#ifdef USE_UART
+
 #include "drivers/system.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
@@ -41,8 +43,6 @@
 #include "drivers/serial_uart.h"
 #include "drivers/serial_uart_impl.h"
 
-#ifdef USE_UART
-
 #ifdef USE_UART1_RX_DMA
 # define UART1_RX_DMA_CHANNEL DMA1_Channel5
 #else

src/main/drivers/serial_uart_stm32f30x.c

@@ -32,6 +32,8 @@
 
 #include "platform.h"
 
+#ifdef USE_UART
+
 #include "drivers/system.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
@@ -42,8 +44,6 @@
 #include "drivers/serial_uart.h"
 #include "drivers/serial_uart_impl.h"
 
-#ifdef USE_UART
-
 // XXX Will DMA eventually be configurable?
 // XXX Do these belong here?
 

src/main/drivers/serial_uart_stm32f4xx.c

@@ -27,6 +27,8 @@
 
 #include "platform.h"
 
+#ifdef USE_UART
+
 #include "drivers/system.h"
 #include "drivers/io.h"
 #include "drivers/dma.h"
@@ -37,8 +39,6 @@
 #include "drivers/serial_uart.h"
 #include "drivers/serial_uart_impl.h"
 
-#ifdef USE_UART
-
 const uartHardware_t uartHardware[UARTDEV_COUNT] = {
 #ifdef USE_UART1
     {

src/main/drivers/serial_uart_stm32f7xx.c

@@ -27,6 +27,8 @@
 
 #include "platform.h"
 
+#ifdef USE_UART
+
 #include "drivers/system.h"
 #include "drivers/dma.h"
 #include "drivers/io.h"
@@ -37,8 +39,6 @@
 #include "drivers/serial_uart.h"
 #include "drivers/serial_uart_impl.h"
 
-#ifdef USE_UART
-
 static void handleUsartTxDma(uartPort_t *s);
 
 const uartHardware_t uartHardware[UARTDEV_COUNT] = {

src/main/interface/cli.c

@@ -3775,8 +3775,10 @@ const cliResourceValue_t resourceTable[] = {
 #ifdef USE_LED_STRIP
     DEFS( OWNER_LED_STRIP,     PG_LED_STRIP_CONFIG, ledStripConfig_t, ioTag ),
 #endif
+#ifdef USE_UART
     DEFA( OWNER_SERIAL_TX,     PG_SERIAL_PIN_CONFIG, serialPinConfig_t, ioTagTx[0], SERIAL_PORT_MAX_INDEX ),
     DEFA( OWNER_SERIAL_RX,     PG_SERIAL_PIN_CONFIG, serialPinConfig_t, ioTagRx[0], SERIAL_PORT_MAX_INDEX ),
+#endif
 #ifdef USE_INVERTER
     DEFA( OWNER_INVERTER,      PG_SERIAL_PIN_CONFIG, serialPinConfig_t, ioTagInverter[0], SERIAL_PORT_MAX_INDEX ),
 #endif

src/main/target/common_defaults_post.h

@@ -322,3 +322,13 @@
 #endif
 #endif
 #endif
+
+#if defined(USE_UART1) || defined(USE_UART2) || defined(USE_UART3) || defined(USE_UART4) || defined(USE_UART5) || defined(USE_UART6) || defined(USE_UART7) || defined(USE_UART8)
+#define USE_UART
+#endif
+
+#ifdef USE_UART
+#if defined(INVERTER_PIN_UART1) || defined(INVERTER_PIN_UART2) || defined(INVERTER_PIN_UART3) || defined(INVERTER_PIN_UART4) || defined(INVERTER_PIN_UART5) || defined(INVERTER_PIN_UART6)
+#define USE_INVERTER
+#endif
+#endif

src/main/target/common_pre.h

@@ -122,6 +122,7 @@
 #endif
 
 #define USE_BRUSHED_ESC_AUTODETECT  // Detect if brushed motors are connected and set defaults appropriately to avoid motors spinning on boot
+
 #define USE_CLI
 #define USE_GYRO_REGISTER_DUMP  // Adds gyroregisters command to cli to dump configured register values
 #define USE_PPM