FURY Target Changes

Makefile

@@ -45,14 +45,14 @@ FORKNAME      = betaflight
 
 CC3D_TARGETS       = CC3D CC3D_OPBL
 NAZE_TARGETS       = ALIENFLIGHTF1 AFROMMINI
-SDCARD_TARGETS     = ALIENFLIGHTF4 BLUEJAYF4 SPRACINGF3MINI AQ32_V2 FURYF3
+SDCARD_TARGETS     = ALIENFLIGHTF4 BLUEJAYF4 SPRACINGF3MINI AQ32_V2 FURYF4 FURYF3
 SPRACINGF3_TARGETS = RMDO IRCFUSIONF3
 SERIAL_USB_TARGETS = SPRACINGF3 IRCFUSIONF3
 
 # Valid targets for STM VCP support
-VCP_VALID_TARGETS  = KKNGF4 FURYF3 REVO BLUEJAYF4 $(CC3D_TARGETS)
+VCP_VALID_TARGETS  = FURYF4 FURYF3 REVO BLUEJAYF4 $(CC3D_TARGETS)
 
-F405_TARGETS     = REVO ALIENFLIGHTF4 BLUEJAYF4 KKNGF4
+F405_TARGETS     = REVO ALIENFLIGHTF4 BLUEJAYF4 FURYF4
 F405_TARGETS_16  =  
 F411_TARGETS     =  
 
@@ -945,11 +945,17 @@ REVO_SRC = \
 		   $(COMMON_SRC) \
 		   $(VCPF4_SRC)
 
-KKNGF4_SRC = \
+FURYF4_SRC = \
            $(STM32F4xx_COMMON_SRC) \
 		   drivers/accgyro_spi_mpu6000.c \
+		   drivers/accgyro_spi_mpu6500.c \
+		   drivers/accgyro_mpu6500.c \
 		   drivers/barometer_ms5611.c \
 		   drivers/display_ug2864hsweg01.c \
+		   drivers/sdcard.c \
+		   drivers/sdcard_standard.c \
+		   io/asyncfatfs/asyncfatfs.c \
+		   io/asyncfatfs/fat_standard.c \
 		   $(HIGHEND_SRC) \
 		   $(COMMON_SRC) \
 		   $(VCPF4_SRC)

src/main/target/FURYF3/target.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#define TARGET_BOARD_IDENTIFIER "FURY"
+#define TARGET_BOARD_IDENTIFIER "FYF3"
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
 
@@ -45,17 +45,17 @@
 #define MPU6500_SPI_INSTANCE             SPI1
 
 #define USE_GYRO_SPI_MPU6000
-#define GYRO_MPU6000_ALIGN CW180_DEG  // changedkb 270
+#define GYRO_MPU6000_ALIGN CW180_DEG
 #define USE_ACC_SPI_MPU6000
-#define ACC_MPU6000_ALIGN CW180_DEG  // changedkb 270
+#define ACC_MPU6000_ALIGN CW180_DEG
 
 #define USE_GYRO_MPU6500
 #define USE_GYRO_SPI_MPU6500
-#define GYRO_MPU6500_ALIGN CW90_DEG  // changedkb 270
+#define GYRO_MPU6500_ALIGN CW90_DEG
 
 #define USE_ACC_MPU6500
 #define USE_ACC_SPI_MPU6500
-#define ACC_MPU6500_ALIGN CW90_DEG  // changedkb 270
+#define ACC_MPU6500_ALIGN CW90_DEG
 
 #define BARO
 #define USE_BARO_MS5611

src/main/target/FURYF4/target.c

@@ -52,4 +52,3 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
 //  { TIM5, GPIOA, Pin_0, TIM_Channel_1, TIM5_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource0, GPIO_AF_TIM5},    // LED Strip
 
 };
-

src/main/target/FURYF4/target.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#define TARGET_BOARD_IDENTIFIER "REVO" //Call it a revo for now so it connects to RFC for testing.
+#define TARGET_BOARD_IDENTIFIER "FYF4" //Call it a revo for now so it connects to RFC for testing.
 #define CONFIG_START_FLASH_ADDRESS (0x08080000) //0x08080000 to 0x080A0000 (FLASH_Sector_8)
 #define CONFIG_SERIALRX_PROVIDER SERIALRX_SBUS
 #define CONFIG_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH
@@ -26,7 +26,7 @@
 #define CONFIG_MSP_PORT 2
 #define CONFIG_RX_SERIAL_PORT 1
 
-#define USBD_PRODUCT_STRING "KopterKontrolNG"
+#define USBD_PRODUCT_STRING "FURYF4"
 
 #define LED0 PB5
 #define LED1 PB4
@@ -36,17 +36,25 @@
 #define INVERTER PC0 // PC0 used as inverter select GPIO
 #define INVERTER_USART USART1
 
-#define MPU6000_CS_PIN        PA4
+#define MPU6000_CS_PIN                   PA4
-#define MPU6000_SPI_INSTANCE  SPI1
+#define MPU6000_SPI_INSTANCE             SPI1
 
-#define ACC
+#define MPU6500_CS_PIN                   PA4
-#define USE_ACC_SPI_MPU6000
+#define MPU6500_SPI_INSTANCE             SPI1
-#define GYRO_MPU6000_ALIGN CW180_DEG
 
-#define GYRO
 #define USE_GYRO_SPI_MPU6000
+#define GYRO_MPU6000_ALIGN CW180_DEG
+#define USE_ACC_SPI_MPU6000
 #define ACC_MPU6000_ALIGN CW180_DEG
 
+#define USE_GYRO_MPU6500
+#define USE_GYRO_SPI_MPU6500
+#define GYRO_MPU6500_ALIGN CW180_DEG
+
+#define USE_ACC_MPU6500
+#define USE_ACC_SPI_MPU6500
+#define ACC_MPU6500_ALIGN CW180_DEG
+
 // MPU6000 interrupts
 #define USE_MPU_DATA_READY_SIGNAL
 #define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready (mag disabled)
@@ -57,10 +65,15 @@
 #define USE_BARO_MS5611
 #define MS5611_I2C_INSTANCE I2CDEV_1
 
-//#define USE_SDCARD
+#define USE_SDCARD
 
 #define SDCARD_DETECT_INVERTED
 
+#define SDCARD_DETECT_PIN                   PD2
+#define SDCARD_SPI_INSTANCE                 SPI3
+#define SDCARD_SPI_CS_PIN                   PB3
+
+/*
 #define SDCARD_DETECT_PIN                   PD2
 #define SDCARD_DETECT_EXTI_LINE             EXTI_Line2
 #define SDCARD_DETECT_EXTI_PIN_SOURCE       EXTI_PinSource2
@@ -69,6 +82,7 @@
 
 #define SDCARD_SPI_INSTANCE                 SPI3
 #define SDCARD_SPI_CS_PIN                   PB3
+*/
 
 // SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init:
 #define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz
@@ -85,7 +99,7 @@
 #define M25P16_CS_PIN         PB3
 #define M25P16_SPI_INSTANCE   SPI3
 
-#define USABLE_TIMER_CHANNEL_COUNT 5  //  chane to 6
+#define USABLE_TIMER_CHANNEL_COUNT 5
 
 #define USE_VCP
 #define VBUS_SENSING_PIN PC5
@@ -150,4 +164,4 @@
 #define USED_TIMERS  ( TIM_N(2) | TIM_N(3) | TIM_N(8) | TIM_N(9))
 
 #define TIMER_APB1_PERIPHERALS (RCC_APB1Periph_TIM2 | RCC_APB1Periph_TIM3 | RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC)
-#define TIMER_APB2_PERIPHERALS (RCC_APB2Periph_TIM8 | RCC_APB2Periph_TIM9)
+#define TIMER_APB2_PERIPHERALS (RCC_APB2Periph_TIM8 | RCC_APB2Periph_TIM9)