Merge pull request #7263 from githubDLG/master

add Variant Target  CrazyBeeF4 Pro series

src/main/target/MATEKF411RX/target.h

@@ -20,8 +20,19 @@
 
 #pragma once
 
+#if defined(CRAZYBEEF4FR)
+#define TARGET_BOARD_IDENTIFIER "C4FR"
+#define USBD_PRODUCT_STRING     "CrazyBee F4 FR"
+#elif defined(CRAZYBEEF4FS)
+#define TARGET_BOARD_IDENTIFIER "C4FS"
+#define USBD_PRODUCT_STRING     "CrazyBee F4 FS"
+#elif defined(CRAZYBEEF4DX)
+#define TARGET_BOARD_IDENTIFIER "C4DX"
+#define USBD_PRODUCT_STRING     "CrazyBee F4 DX"
+#else
 #define TARGET_BOARD_IDENTIFIER "M41R"
 #define USBD_PRODUCT_STRING     "MATEKF411RX"
+#endif
 
 #define LED0_PIN                PC13
 
@@ -47,11 +58,18 @@
 
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
+#if defined(CRAZYBEEF4FS) || defined(CRAZYBEEF4FR) || defined(CRAZYBEEF4DX)
+#define GYRO_1_ALIGN            CW90_DEG
+#else
 #define GYRO_1_ALIGN            CW180_DEG
+#endif
 #define USE_ACC
 #define USE_ACC_SPI_MPU6000
+#if defined(CRAZYBEEF4FS) || defined(CRAZYBEEF4FR) || defined(CRAZYBEEF4DX)
+#define ACC_1_ALIGN            CW90_DEG
+#else
 #define ACC_1_ALIGN             CW180_DEG
-
+#endif
 // *************** SPI2 OSD *****************************
 #define USE_SPI_DEVICE_2
 #define SPI2_SCK_PIN            PB13
@@ -67,32 +85,61 @@
 #define SPI3_SCK_PIN            PB3
 #define SPI3_MISO_PIN           PB4
 #define SPI3_MOSI_PIN           PB5
-
-#define USE_RX_SPI
-#define RX_SPI_INSTANCE         SPI3
 #define RX_NSS_PIN              PA15
 
+#if defined(CRAZYBEEF4FS)
+#define USE_LED_STRIP
+#define USE_RX_SPI
+#define USE_RX_FLYSKY
+#define RX_CHANNELS_AETR
+#define DEFAULT_RX_FEATURE      FEATURE_RX_SPI
+#define RX_SPI_DEFAULT_PROTOCOL RX_SPI_A7105_FLYSKY_2A
+#define FLYSKY_2A_CHANNEL_COUNT 14
+#define RX_SPI_INSTANCE         SPI3
+#define RX_IRQ_PIN              PA14
+#define BINDPLUG_PIN            PB2
+#define USE_RX_FLYSKY_SPI_LED
+#define RX_FLYSKY_SPI_LED_PIN   PB9
+#elif defined(CRAZYBEEF4DX)
+#define USE_LED_STRIP
+#define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
+#define SERIALRX_PROVIDER       SERIALRX_SPEKTRUM2048
+#define SERIALRX_UART           SERIAL_PORT_USART2
+#define RX_CHANNELS_TAER
+#elif defined(CRAZYBEEF4FR)
+#define USE_LED_STRIP
+#define USE_RX_SPI
+#define RX_SPI_INSTANCE         SPI3
 #define RX_CC2500_SPI_DISABLE_CHIP_DETECTION
 #define RX_CC2500_SPI_GDO_0_PIN     PC14
-#define RX_SPI_LED_PIN          PB9
-#define RX_SPI_LED_INVERTED
-
-#define USE_RX_CC2500_SPI_PA_LNA
-#define RX_CC2500_SPI_TX_EN_PIN      PA8
-#define RX_CC2500_SPI_LNA_EN_PIN     PA13
-
-#define USE_RX_CC2500_SPI_DIVERSITY
-#define RX_CC2500_SPI_ANT_SEL_PIN    PA14
-
-#define BINDPLUG_PIN             PB2
-
+#define RX_CC2500_SPI_LED_PIN       PB9
+#define BINDPLUG_PIN            PB2
 #define USE_RX_FRSKY_SPI_D
 #define USE_RX_FRSKY_SPI_X
 #define USE_RX_SFHSS_SPI
 #define DEFAULT_RX_FEATURE      FEATURE_RX_SPI
 #define RX_SPI_DEFAULT_PROTOCOL RX_SPI_FRSKY_X
 #define USE_RX_FRSKY_SPI_TELEMETRY
-
+#else
+#define USE_RX_SPI
+#define RX_SPI_INSTANCE         SPI3
+#define RX_CC2500_SPI_DISABLE_CHIP_DETECTION
+#define RX_CC2500_SPI_GDO_0_PIN     PC14
+#define RX_CC2500_SPI_LED_PIN       PB9
+#define RX_CC2500_SPI_LED_PIN_INVERTED
+#define USE_RX_CC2500_SPI_PA_LNA
+#define RX_CC2500_SPI_TX_EN_PIN      PA8
+#define RX_CC2500_SPI_LNA_EN_PIN     PA13
+#define USE_RX_CC2500_SPI_DIVERSITY
+#define RX_CC2500_SPI_ANT_SEL_PIN    PA14
+#define BINDPLUG_PIN            PB2
+#define USE_RX_FRSKY_SPI_D
+#define USE_RX_FRSKY_SPI_X
+#define USE_RX_SFHSS_SPI
+#define DEFAULT_RX_FEATURE      FEATURE_RX_SPI
+#define RX_SPI_DEFAULT_PROTOCOL RX_SPI_FRSKY_X
+#define USE_RX_FRSKY_SPI_TELEMETRY
+#endif
 // *************** UART *****************************
 #define USE_VCP
 

src/main/target/MATEKF411RX/target.mk

@@ -11,3 +11,8 @@ TARGET_SRC = \
             rx/cc2500_frsky_d.c \
             rx/cc2500_frsky_x.c \
             rx/cc2500_sfhss.c
+ifeq ($(TARGET), CRAZYBEEF4FS)
+TARGET_SRC += \
+            drivers/rx/rx_a7105.c \
+            rx/flysky.c
+endif