diff --git a/src/main/target/FURYF3/FURYF3OSD.mk b/src/main/target/FURYF3/FURYF3OSD.mk new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h index e408e2503..21fb5b0f9 100644 --- a/src/main/target/FURYF3/target.h +++ b/src/main/target/FURYF3/target.h @@ -17,7 +17,13 @@ #pragma once -#define TARGET_BOARD_IDENTIFIER "FYF3" +#ifdef FURYF3OSD + #define TARGET_BOARD_IDENTIFIER "FY3O" +// #define USBD_PRODUCT_STRING "FuryF3OSD" +#else + #define TARGET_BOARD_IDENTIFIER "FYF3" +// #define USBD_PRODUCT_STRING "FuryF3" +#endif #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT #define CONFIG_PREFER_ACC_ON @@ -63,10 +69,6 @@ #define USE_ACC_SPI_MPU6500 #define ACC_MPU6500_ALIGN CW90_DEG -#define BARO -#define USE_BARO_MS5611 -#define USE_BARO_BMP280 - #define USE_SPI #define USE_SPI_DEVICE_1 #define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5 @@ -76,37 +78,58 @@ #define SPI2_MISO_PIN PB14 #define SPI2_MOSI_PIN PB15 -//#define USE_FLASHFS -//#define USE_FLASH_M25P16 -//#define M25P16_CS_PIN PB12 -//#define M25P16_SPI_INSTANCE SPI2 +#ifdef FURYF3OSD + #define OSD + // include the max7456 driver + #define USE_MAX7456 + #define MAX7456_SPI_INSTANCE SPI1 + #define MAX7456_SPI_CS_PIN PC13 + #define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD*2) + #define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) -#define USE_SDCARD -#define USE_SDCARD_SPI2 + #define USE_FLASHFS + #define USE_FLASH_M25P16 + #define M25P16_CS_PIN PB12 + #define M25P16_SPI_INSTANCE SPI2 + + #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT + + #define DEFAULT_FEATURES (FEATURE_OSD) + #define BOARD_HAS_CURRENT_SENSOR +#else -#define SDCARD_DETECT_INVERTED + #define USE_SDCARD + #define USE_SDCARD_SPI2 -#define SDCARD_DETECT_PIN PB2 -#define SDCARD_DETECT_EXTI_LINE EXTI_Line2 -#define SDCARD_DETECT_EXTI_PIN_SOURCE EXTI_PinSource2 -#define SDCARD_DETECT_EXTI_PORT_SOURCE EXTI_PortSourceGPIOB -#define SDCARD_DETECT_EXTI_IRQn EXTI15_10_IRQn + #define SDCARD_DETECT_INVERTED + + #define SDCARD_DETECT_PIN PB2 + #define SDCARD_SPI_INSTANCE SPI2 + #define SDCARD_SPI_CS_PIN SPI2_NSS_PIN + + // SPI2 is on the APB1 bus whose clock runs at 36MHz. Divide to under 400kHz for init: + #define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 128 + // Divide to under 25MHz for normal operation: + #define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2 -#define SDCARD_SPI_INSTANCE SPI2 -#define SDCARD_SPI_CS_GPIO SPI2_GPIO -#define SDCARD_SPI_CS_PIN SPI2_NSS_PIN + // Note, this is the same DMA channel as UART1_RX. Luckily we don't use DMA for USART Rx. + #define SDCARD_DMA_CHANNEL_TX DMA1_Channel5 + #define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA1_FLAG_TC5 -// SPI2 is on the APB1 bus whose clock runs at 36MHz. Divide to under 400kHz for init: -#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 128 -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 2 + // Performance logging for SD card operations: + // #define AFATFS_USE_INTROSPECTIVE_LOGGING + + #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT + + #define BARO + #define USE_BARO_MS5611 -// Note, this is the same DMA channel as UART1_RX. Luckily we don't use DMA for USART Rx. -#define SDCARD_DMA_CHANNEL_TX DMA1_Channel5 -#define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA1_FLAG_TC5 +#endif -// Performance logging for SD card operations: -// #define AFATFS_USE_INTROSPECTIVE_LOGGING +#define USE_I2C +#define I2C_DEVICE (I2CDEV_1) // SDA (PB9/AF4), SCL (PB8/AF4) +#define I2C1_SCL PB8 +#define I2C1_SDA PB9 #define USE_VCP #define USE_UART1 @@ -117,6 +140,13 @@ #define SERIAL_PORT_COUNT 6 +#define SOFTSERIAL1_RX_PIN PB0 +#define SOFTSERIAL1_TX_PIN PB1 + + #define SONAR + #define SONAR_ECHO_PIN PB1 + #define SONAR_TRIGGER_PIN PB0 + #define USE_ESCSERIAL #define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 @@ -129,15 +159,6 @@ #define UART3_TX_PIN PB10 // PB10 (AF7) #define UART3_RX_PIN PB11 // PB11 (AF7) -#define SOFTSERIAL1_RX_PIN PB0 -#define SOFTSERIAL1_TX_PIN PB1 - -#define USE_I2C -#define USE_I2C_DEVICE_1 -#define I2C_DEVICE (I2CDEV_1) -#define I2C1_SCL PB8 -#define I2C1_SDA PB9 - #define BOARD_HAS_VOLTAGE_DIVIDER #define USE_ADC #define ADC_INSTANCE ADC1 @@ -145,10 +166,6 @@ #define RSSI_ADC_PIN PA1 #define CURRENT_METER_ADC_PIN PA2 -#define SONAR -#define SONAR_ECHO_PIN PB1 -#define SONAR_TRIGGER_PIN PB0 - #define DEFAULT_RX_FEATURE FEATURE_RX_PPM #define SPEKTRUM_BIND_PIN UART3_RX_PIN diff --git a/src/main/target/FURYF3/target.mk b/src/main/target/FURYF3/target.mk index dadfa469d..37ef421bb 100644 --- a/src/main/target/FURYF3/target.mk +++ b/src/main/target/FURYF3/target.mk @@ -1,12 +1,21 @@ F3_TARGETS += $(TARGET) -FEATURES = VCP SDCARD ONBOARDFLASH +ifeq ($(TARGET), FURYF3OSD) +FEATURES += VCP ONBOARDFLASH +else +FEATURES += VCP SDCARD +endif TARGET_SRC = \ drivers/accgyro/accgyro_mpu.c \ - drivers/barometer/barometer_ms5611.c \ - drivers/barometer/barometer_bmp280.c \ drivers/accgyro/accgyro_spi_mpu6000.c \ drivers/accgyro/accgyro_mpu6500.c \ drivers/accgyro/accgyro_spi_mpu6500.c \ drivers/accgyro/accgyro_spi_icm20689.c +ifeq ($(TARGET), FURYF3OSD) +TARGET_SRC += \ + drivers/max7456.c +else +TARGET_SRC += \ + drivers/barometer/barometer_ms5611.c +endif \ No newline at end of file diff --git a/src/main/target/FURYF4/FURYF4OSD.mk b/src/main/target/FURYF4/FURYF4OSD.mk new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/target/FURYF4/target.c b/src/main/target/FURYF4/target.c index e6c602e27..52dc1ded3 100644 --- a/src/main/target/FURYF4/target.c +++ b/src/main/target/FURYF4/target.c @@ -25,22 +25,15 @@ #include "drivers/timer_def.h" const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { -/* - { TIM8, IO_TAG(PC9), TIM_Channel_4, TIM_USE_PPM, 0, GPIO_AF_TIM8, NULL, 0, 0 }, // PPM_IN - { TIM2, IO_TAG(PA3), TIM_Channel_4, TIM_USE_MOTOR, 1, GPIO_AF_TIM2, DMA1_Stream6, DMA_Channel_3, DMA1_ST6_HANDLER }, // S1_OUT - { TIM3, IO_TAG(PB0), TIM_Channel_3, TIM_USE_MOTOR, 1, GPIO_AF_TIM3, DMA1_Stream7, DMA_Channel_5, DMA1_ST7_HANDLER }, // S2_OUT - { TIM3, IO_TAG(PB1), TIM_Channel_4, TIM_USE_MOTOR, 1, GPIO_AF_TIM3, DMA1_Stream2, DMA_Channel_5, DMA1_ST2_HANDLER }, // S3_OUT - { TIM2, IO_TAG(PA2), TIM_Channel_3, TIM_USE_MOTOR, 1, GPIO_AF_TIM2, DMA1_Stream1, DMA_Channel_3, DMA1_ST1_HANDLER }, // S4_OUT -*/ -// { TIM5, GPIOA, Pin_0, TIM_Channel_1, TIM5_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource0, GPIO_AF_TIM5 }, // LED Strip - DEF_TIM(TIM8, CH4, PC9, TIM_USE_PPM, TIMER_INPUT_ENABLED, 0 ), // PPM IN - DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 1 ), // S1_OUT - DMA1_ST6_CH3 - DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 0 ), // S2_OUT - DMA1_ST7_CH5 - DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 0 ), // S3_OUT - DMA1_ST2_CH5 - DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 0 ), // S4_OUT - DMA1_ST1_CH3 + DEF_TIM(TIM8, CH4, PC9, TIM_USE_PPM, TIMER_INPUT_ENABLED, 0 ), // PPM IN + DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 1 ), // S1_OUT - DMA1_ST6_CH3 + DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 0 ), // S2_OUT - DMA1_ST7_CH5 + DEF_TIM(TIM8, CH3N, PB1, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED, 0 ), // S3_OUT - DMA2_ST2_CH0 +// DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 0 ), // S3_OUT - DMA1_ST2_CH5 + DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED, 0 ), // S4_OUT - DMA1_ST1_CH3 - DEF_TIM(TIM5, CH1, PA0, TIM_USE_LED, TIMER_OUTPUT_ENABLED, 0 ), // LED_STRIP - DMA1_ST2_CH6 + DEF_TIM(TIM5, CH1, PA0, TIM_USE_LED, TIMER_OUTPUT_ENABLED, 0 ), // LED_STRIP - DMA1_ST2_CH6 }; diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h index 28c299016..f0e39218f 100644 --- a/src/main/target/FURYF4/target.h +++ b/src/main/target/FURYF4/target.h @@ -17,9 +17,13 @@ #pragma once -#define TARGET_BOARD_IDENTIFIER "FYF4" - -#define USBD_PRODUCT_STRING "FuryF4" +#ifdef FURYF4OSD + #define TARGET_BOARD_IDENTIFIER "FY4O" + #define USBD_PRODUCT_STRING "FuryF4OSD" +#else + #define TARGET_BOARD_IDENTIFIER "FYF4" + #define USBD_PRODUCT_STRING "FuryF4" +#endif #define LED0 PB5 #define LED1 PB4 @@ -67,45 +71,50 @@ #define USE_ACC_SPI_MPU6500 #define ACC_MPU6500_ALIGN CW180_DEG -#define BARO -#define USE_BARO_MS5611 -#define MS5611_I2C_INSTANCE I2CDEV_1 +#ifdef FURYF4OSD + #define OSD + #define USE_MAX7456 + #define MAX7456_SPI_INSTANCE SPI2 + #define MAX7456_SPI_CS_PIN PB12 + #define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD*2) + #define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) + + #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT + + #define DEFAULT_FEATURES FEATURE_OSD + +#else -#define USE_SDCARD + #define BARO + #define USE_BARO_MS5611 + #define MS5611_I2C_INSTANCE I2CDEV_1 -#define SDCARD_DETECT_INVERTED + #define USE_SDCARD -#define SDCARD_DETECT_PIN PD2 -#define SDCARD_SPI_INSTANCE SPI2 -#define SDCARD_SPI_CS_PIN PB12 + #define SDCARD_DETECT_INVERTED -/* -#define SDCARD_DETECT_PIN PD2 -#define SDCARD_DETECT_EXTI_LINE EXTI_Line2 -#define SDCARD_DETECT_EXTI_PIN_SOURCE EXTI_PinSource2 -#define SDCARD_DETECT_EXTI_PORT_SOURCE EXTI_PortSourceGPIOD -#define SDCARD_DETECT_EXTI_IRQn EXTI2_IRQn + #define SDCARD_DETECT_PIN PD2 + #define SDCARD_SPI_INSTANCE SPI2 + #define SDCARD_SPI_CS_PIN PB12 -#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 + // Divide to under 25MHz for normal operation: + #define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz -// 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 -// Divide to under 25MHz for normal operation: -#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz + //#define SDCARD_DMA_CHANNEL_TX DMA1_Stream5 + //#define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA_FLAG_TCIF5 + //#define SDCARD_DMA_CLK RCC_AHB1Periph_DMA1 + //#define SDCARD_DMA_CHANNEL DMA_Channel_0 + #define SDCARD_DMA_CHANNEL_TX DMA1_Stream4 + #define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA_FLAG_TCIF4 + #define SDCARD_DMA_CLK RCC_AHB1Periph_DMA1 + #define SDCARD_DMA_CHANNEL DMA_Channel_0 + + #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT -//#define SDCARD_DMA_CHANNEL_TX DMA1_Stream5 -//#define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA_FLAG_TCIF5 -//#define SDCARD_DMA_CLK RCC_AHB1Periph_DMA1 -//#define SDCARD_DMA_CHANNEL DMA_Channel_0 - -#define SDCARD_DMA_CHANNEL_TX DMA1_Stream4 -#define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA_FLAG_TCIF4 -#define SDCARD_DMA_CLK RCC_AHB1Periph_DMA1 -#define SDCARD_DMA_CHANNEL DMA_Channel_0 - +#endif #define USE_FLASHFS #define USE_FLASH_M25P16 @@ -119,7 +128,7 @@ #define USE_UART1 #define UART1_RX_PIN PA10 #define UART1_TX_PIN PA9 -#define UART1_AHB1_PERIPHERALS RCC_AHB1Periph_DMA2 +//#define UART1_AHB1_PERIPHERALS RCC_AHB1Periph_DMA2 #define USE_UART3 #define UART3_RX_PIN PB11 @@ -167,10 +176,9 @@ #define CURRENT_METER_ADC_PIN PC3 #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL +#define SERIALRX_UART SERIAL_PORT_USART1 #define SERIALRX_PROVIDER SERIALRX_SBUS -#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT - #define SPEKTRUM_BIND_PIN UART3_RX_PIN #define USE_SERIAL_4WAY_BLHELI_INTERFACE diff --git a/src/main/target/FURYF4/target.mk b/src/main/target/FURYF4/target.mk index 65ece9877..06b60c1c7 100644 --- a/src/main/target/FURYF4/target.mk +++ b/src/main/target/FURYF4/target.mk @@ -1,10 +1,20 @@ F405_TARGETS += $(TARGET) -FEATURES += SDCARD VCP ONBOARDFLASH +ifeq ($(TARGET), FURYF4OSD) +FEATURES += VCP ONBOARDFLASH +else +FEATURES += VCP ONBOARDFLASH SDCARD +endif TARGET_SRC = \ drivers/accgyro/accgyro_spi_mpu6000.c \ drivers/accgyro/accgyro_spi_mpu6500.c \ drivers/accgyro/accgyro_mpu6500.c \ - drivers/accgyro/accgyro_spi_icm20689.c \ - drivers/barometer/barometer_ms5611.c + drivers/accgyro/accgyro_spi_icm20689.c +ifeq ($(TARGET), FURYF4OSD) +TARGET_SRC += \ + drivers/max7456.c +else +TARGET_SRC += \ + drivers/barometer/barometer_ms5611.c +endif