Merge pull request #2286 from mikeller/cleanup_spracingf3_target

Cleaned up SPRACINGF3 (and TINYBEEF3 variant) targets.

src/main/target/SPRACINGF3MINI/target.h

@@ -28,9 +28,6 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
 
-// early prototype had slightly different pin mappings.
-//#define SPRACINGF3MINI_MKII_REVA
-
 #define LED0                    PB3
 #endif
 
@@ -39,36 +36,35 @@
 
 #define USE_EXTI
 #define MPU_INT_EXTI            PC13
-#define EXTI15_10_CALLBACK_HANDLER_COUNT 2 // MPU_INT, SDCardDetect
 #define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
-#define USE_MAG_DATA_READY_SIGNAL
-#define ENSURE_MAG_DATA_READY_IS_HIGH
-
 #define GYRO
 #define ACC
 
-#define BARO
-#define USE_BARO_BMP280
-
 #ifdef TINYBEEF3
+#define EXTI15_10_CALLBACK_HANDLER_COUNT 1 // MPU_INT
+
 #define USE_GYRO_SPI_MPU6500
 #define GYRO_MPU6500_ALIGN      CW270_DEG
 
 #define USE_ACC_SPI_MPU6500
 #define ACC_MPU6500_ALIGN       CW270_DEG
-
-#define MAG_AK8963_ALIGN CW90_DEG_FLIP
 #else
-//#define USE_FAKE_GYRO
+#define EXTI15_10_CALLBACK_HANDLER_COUNT 2 // MPU_INT, SDCardDetect
+
+#define USE_MAG_DATA_READY_SIGNAL
+#define ENSURE_MAG_DATA_READY_IS_HIGH
+
 #define USE_GYRO_MPU6500
 #define GYRO_MPU6500_ALIGN      CW180_DEG
 
-//#define USE_FAKE_ACC
 #define USE_ACC_MPU6500
 #define ACC_MPU6500_ALIGN       CW180_DEG
 
+#define BARO
+#define USE_BARO_BMP280
+
 #define MAG
 #define USE_MPU9250_MAG // Enables bypass configuration
 #define USE_MAG_AK8975
@@ -80,24 +76,20 @@
 //#define SONAR_ECHO_PIN          PB1
 //#define SONAR_TRIGGER_PIN       PB0
 
+#define BRUSHED_ESC_AUTODETECT
+
 #define USB_IO
 
-#ifndef TINYBEEF3
-#define USB_CABLE_DETECTION
-
-#define USB_DETECT_PIN          PB5
-#endif
-
 #define USE_VCP
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
-#define USE_SOFTSERIAL1
-#define SERIAL_PORT_COUNT       5
 
 #define USE_ESCSERIAL
 #define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
 
+#define USE_SERIAL_4WAY_BLHELI_INTERFACE
+
 #define UART1_TX_PIN            PA9
 #define UART1_RX_PIN            PA10
 
@@ -107,21 +99,26 @@
 #define UART3_TX_PIN            PB10 // PB10 (AF7)
 #define UART3_RX_PIN            PB11 // PB11 (AF7)
 
+#define SPEKTRUM_BIND
+// USART3,
+#define BIND_PIN                PB11
+
+#ifdef TINYBEEF3
+#define SERIAL_PORT_COUNT       4
+#else
+#define USB_CABLE_DETECTION
+#define USB_DETECT_PIN          PB5
+
+#define USE_SOFTSERIAL1
 #define SOFTSERIAL_1_TIMER TIM2
 #define SOFTSERIAL_1_TIMER_RX_HARDWARE 9 // PA0 / PAD3
 #define SOFTSERIAL_1_TIMER_TX_HARDWARE 10 // PA1 / PAD4
 #define SONAR_SOFTSERIAL1_EXCLUSIVE
 
-#define USE_I2C
-#define I2C_DEVICE              (I2CDEV_1) // PB6/SCL, PB7/SDA
+#define SERIAL_PORT_COUNT       5
+#endif
 
 #define USE_SPI
-#define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
-
-#define SPI2_NSS_PIN            PB12
-#define SPI2_SCK_PIN            PB13
-#define SPI2_MISO_PIN           PB14
-#define SPI2_MOSI_PIN           PB15
 
 #ifdef TINYBEEF3
 #define USE_SPI_DEVICE_1 // PB9,3,4,5 on AF5 SPI1 (MPU)
@@ -131,9 +128,18 @@
 #define SPI1_MISO_PIN           PB4
 #define SPI1_MOSI_PIN           PB5
 
-#define MPU6500_CS_PIN                   PB9
+#define MPU6500_CS_PIN                   SPI1_NSS_PIN
 #define MPU6500_SPI_INSTANCE             SPI1
-#endif
+#else
+#define USE_I2C
+#define I2C_DEVICE              (I2CDEV_1) // PB6/SCL, PB7/SDA
+
+#define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
+
+#define SPI2_NSS_PIN            PB12
+#define SPI2_SCK_PIN            PB13
+#define SPI2_MISO_PIN           PB14
+#define SPI2_MOSI_PIN           PB15
 
 #define USE_SDCARD
 #define USE_SDCARD_SPI2
@@ -156,6 +162,9 @@
 // Performance logging for SD card operations:
 // #define AFATFS_USE_INTROSPECTIVE_LOGGING
 
+#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
+#endif
+
 #define BOARD_HAS_VOLTAGE_DIVIDER
 #define USE_ADC
 #define ADC_INSTANCE                ADC2
@@ -169,16 +178,11 @@
 
 #define REDUCE_TRANSPONDER_CURRENT_DRAW_WHEN_USB_CABLE_PRESENT
 
-#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
-
 #define DEFAULT_RX_FEATURE      FEATURE_RX_PPM
-#ifdef TINYBEEF3
-#define BRUSHED_ESC_AUTODETECT
-#else
-#define DEFAULT_FEATURES        FEATURE_BLACKBOX
-#endif
 
 #ifndef TINYBEEF3
+#define DEFAULT_FEATURES        FEATURE_BLACKBOX
+
 #define BUTTONS
 #define BUTTON_A_PIN            PB1
 #define BUTTON_B_PIN            PB0
@@ -187,12 +191,6 @@
 #define BINDPLUG_PIN            PB0
 #endif
 
-#define SPEKTRUM_BIND
-// USART3,
-#define BIND_PIN                PB11
-
-#define USE_SERIAL_4WAY_BLHELI_INTERFACE
-
 #define TARGET_IO_PORTA         0xffff
 #define TARGET_IO_PORTB         0xffff
 #define TARGET_IO_PORTC         (BIT(13)|BIT(14)|BIT(15))