VANTAC_RF007: combine targets

Author: lorenzo25832

src/main/target/VANTAC_RF007/CMakeLists.txt

@@ -1,3 +1 @@
 target_stm32f722xe(VANTAC_RF007)
-target_stm32f722xe(VANTAC_RF007_9SERVOS)
-target_stm32f722xe(VANTAC_RF007_NOI2C)

src/main/target/VANTAC_RF007/target.c

@@ -36,10 +36,8 @@ timerHardware_t timerHardware[] = {
     DEF_TIM(TIM5, CH3, PA2,   TIM_USE_OUTPUT_AUTO, 0, 0),   // labelled "RPM", clashes with UART2 TX
     DEF_TIM(TIM5, CH4, PA3,   TIM_USE_OUTPUT_AUTO, 0, 0),   // labelled "TLM", clashes with UART2 RX
 
-#if defined(VANTAC_RF007_9SERVOS) || defined(VANTAC_RF007_NOI2C)
     DEF_TIM(TIM4, CH1, PB6,   TIM_USE_OUTPUT_AUTO, 0, 0),   // labelled "AUX", clashes with UART1 TX and I2C1 SCL
     DEF_TIM(TIM4, CH2, PB7,   TIM_USE_OUTPUT_AUTO, 0, 0),   // labelled "SBUS", clashes with UART1 RX and I2C1 SDA
-#endif
 };
 
 const int timerHardwareCount = sizeof(timerHardware) / sizeof(timerHardware[0]);

src/main/target/VANTAC_RF007/target.h

@@ -47,26 +47,22 @@
 //#define I2C1_SCL                PB6
 //#define I2C1_SDA                PB7
 
-#if defined(VANTAC_RF007) || defined(VANTAC_RF007_9SERVOS)
 #define USE_I2C_DEVICE_2 // clashes with UART3
 #define I2C2_SCL                PB10
 #define I2C2_SDA                PB11
-#define DEFAULT_I2C BUS_I2C2
-#else
-#define DEFAULT_I2C BUS_I2C1
-#endif
+#define EXTERNAL_I2C BUS_I2C2
 
 #define USE_BARO
 #define BARO_I2C_BUS            BUS_I2C1
 #define USE_BARO_SPL06
 #define SPL06_I2C_ADDR 119
 
-#define TEMPERATURE_I2C_BUS     DEFAULT_I2C
+#define TEMPERATURE_I2C_BUS     EXTERNAL_I2C
 
-#define PITOT_I2C_BUS           DEFAULT_I2C
+#define PITOT_I2C_BUS           EXTERNAL_I2C
 
 #define USE_RANGEFINDER
-#define RANGEFINDER_I2C_BUS     DEFAULT_I2C
+#define RANGEFINDER_I2C_BUS     EXTERNAL_I2C
 
 // *************** SPI2 Blackbox *******************
 #define USE_SPI_DEVICE_2
@@ -83,22 +79,18 @@
 // *************** UART *****************************
 #define USE_VCP
 
-#ifdef VANTAC_RF007
 #define USE_UART1 // clashes with I2C1
 #define UART1_TX_PIN            PB6
 #define UART1_RX_PIN            PB7 // pin labelled "SBUS"
-#endif
 
-//#define USE_UART2 // clashes with 2 servo outputs
-//#define UART2_TX_PIN            PA2 // pin labelled as "RPM"
-//#define UART2_RX_PIN            PA3 // pin labelled as "TLM"
+#define USE_UART2
+#define UART2_TX_PIN            PA2 // pin labelled as "RPM"
+#define UART2_RX_PIN            PA3 // pin labelled as "TLM"
 
-#ifdef VANTAC_RF007_NOI2C
-#define USE_UART3
+#define USE_UART3 // clashes with I2C2
 // port labelled "C"
 #define UART3_TX_PIN            PB10
 #define UART3_RX_PIN            PB11
-#endif
 
 #define USE_UART4
 // port labelled "A"
@@ -110,13 +102,7 @@
 #define UART5_TX_PIN            PC12
 #define UART5_RX_PIN            PD2
 
-#if defined(VANTAC_RF007)
-#define SERIAL_PORT_COUNT       4
-#elif defined(VANTAC_RF007_9SERVOS)
-#define SERIAL_PORT_COUNT       3
-#elif defined(VANTAC_RF007_NOI2C)
-#define SERIAL_PORT_COUNT       4
-#endif
+#define SERIAL_PORT_COUNT       6
 
 #define DEFAULT_RX_TYPE         RX_TYPE_SERIAL
 #define SERIALRX_PROVIDER       SERIALRX_FBUS
@@ -148,11 +134,7 @@
 #define TARGET_IO_PORTC 0xffff
 #define TARGET_IO_PORTD 0xffff
 
-#if defined(VANTAC_RF007)
-#define MAX_PWM_OUTPUT_PORTS        7
-#elif defined(VANTAC_RF007_9SERVOS) || defined(VANTAC_RF007_NOI2C)
 #define MAX_PWM_OUTPUT_PORTS        9
-#endif
 
 #define USE_DSHOT
 #define USE_SERIALSHOT