diff --git a/src/main/target/SPRACINGF3/FLIP32F3OSD.mk b/src/main/target/SPRACINGF3/FLIP32F3OSD.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/main/target/SPRACINGF3/ZCOREF3.mk b/src/main/target/SPRACINGF3/ZCOREF3.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h index 94cd16bae9..644e81e7aa 100644 --- a/src/main/target/SPRACINGF3/target.h +++ b/src/main/target/SPRACINGF3/target.h @@ -17,15 +17,31 @@ #pragma once -#ifdef RMDO +#if defined(RMDO) #define TARGET_BOARD_IDENTIFIER "RMDO" +#elif defined(ZCOREF3) +#define TARGET_BOARD_IDENTIFIER "ZCF3" +#elif defined(FLIP32F3OSD) +#define TARGET_BOARD_IDENTIFIER "FLF3" #else #define TARGET_BOARD_IDENTIFIER "SRF3" #endif +#if defined(ZCOREF3) +#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT + +#define LED0 PB8 +#else #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE #define LED0 PB3 +#endif + +#if defined(ZCOREF3) +#define EXTI15_10_CALLBACK_HANDLER_COUNT 1 +#elif defined(FLIP32F3OSD) +#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready and MAG data ready +#endif #define BEEPER PC15 #define BEEPER_INVERTED @@ -36,22 +52,61 @@ #define ENSURE_MPU_DATA_READY_IS_LOW #define GYRO -#define USE_GYRO_MPU6050 -#define GYRO_MPU6050_ALIGN CW270_DEG #define ACC -#define USE_ACC_MPU6050 -#define ACC_MPU6050_ALIGN CW270_DEG #define BARO #define USE_BARO_BMP280 -#ifdef RMDO +#if defined(FLIP32F3OSD) +#define USE_GYRO_MPU6500 +#define GYRO_MPU6500_ALIGN CW270_DEG -#undef USE_GPS +#define USE_ACC_MPU6500 +#define ACC_MPU6500_ALIGN CW270_DEG + +#elif defined(ZCOREF3) +#define GYRO +#define USE_GYRO_MPU6500 +#define USE_GYRO_SPI_MPU6500 +#define GYRO_MPU6500_ALIGN CW180_DEG + +#define ACC +#define USE_ACC_MPU6500 +#define USE_ACC_SPI_MPU6500 +#define ACC_MPU6500_ALIGN CW180_DEG + +#define USE_SPI_DEVICE_1 // PB9,3,4,5 on AF5 SPI1 (MPU) + +#define SPI1_NSS_PIN PB9 +#define SPI1_SCK_PIN PB3 +#define SPI1_MISO_PIN PB4 +#define SPI1_MOSI_PIN PB5 + +#define MPU6500_CS_PIN PB9 +#define MPU6500_SPI_INSTANCE SPI1 #else +#define USE_GYRO_MPU6050 +#define GYRO_MPU6050_ALIGN CW270_DEG +#define USE_ACC_MPU6050 +#define ACC_MPU6050_ALIGN CW270_DEG +#endif + +#if defined(FLIP32F3OSD) +#define SONAR +#define SONAR_TRIGGER_PIN PB0 +#define SONAR_ECHO_PIN PB1 + +#elif defined(RMDO) +#undef USE_GPS + +#elif defined(ZCOREF3) +#define USE_MAG_DATA_READY_SIGNAL +#define ENSURE_MAG_DATA_READY_IS_HIGH + +#else //SPRACINGF3 #define USE_BARO_MS5611 #define USE_BARO_BMP085 @@ -63,23 +118,32 @@ #define USE_MAG_DATA_READY_SIGNAL #define ENSURE_MAG_DATA_READY_IS_HIGH #define MAG_INT_EXTI PC14 - #endif #define USE_FLASHFS #define USE_FLASH_M25P16 -//#define SONAR -//#define SONAR_TRIGGER_PIN PB0 -//#define SONAR_ECHO_PIN PB1 - #define USE_UART1 #define USE_UART2 #define USE_UART3 + +#if defined(ZCOREF3) +#define SERIAL_PORT_COUNT 3 + +#else #define USE_SOFTSERIAL1 #define USE_SOFTSERIAL2 #define SERIAL_PORT_COUNT 5 +#define SOFTSERIAL_1_TIMER TIM3 +#define SOFTSERIAL_1_TIMER_RX_HARDWARE 4 // PWM 5 +#define SOFTSERIAL_1_TIMER_TX_HARDWARE 5 // PWM 6 +#define SOFTSERIAL_2_TIMER TIM3 +#define SOFTSERIAL_2_TIMER_RX_HARDWARE 6 // PWM 7 +#define SOFTSERIAL_2_TIMER_TX_HARDWARE 7 // PWM 8 +#define SONAR_SOFTSERIAL2_EXCLUSIVE +#endif + #define USE_ESCSERIAL #define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 @@ -92,14 +156,6 @@ #define UART3_TX_PIN PB10 // PB10 (AF7) #define UART3_RX_PIN PB11 // PB11 (AF7) -#define SOFTSERIAL_1_TIMER TIM3 -#define SOFTSERIAL_1_TIMER_RX_HARDWARE 4 // PWM 5 -#define SOFTSERIAL_1_TIMER_TX_HARDWARE 5 // PWM 6 -#define SOFTSERIAL_2_TIMER TIM3 -#define SOFTSERIAL_2_TIMER_RX_HARDWARE 6 // PWM 7 -#define SOFTSERIAL_2_TIMER_TX_HARDWARE 7 // PWM 8 -#define SONAR_SOFTSERIAL2_EXCLUSIVE - #define USE_I2C #define I2C_DEVICE (I2CDEV_1) // PB6/SCL, PB7/SDA @@ -129,7 +185,7 @@ #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define DEFAULT_RX_FEATURE FEATURE_RX_PPM -#define DEFAULT_FEATURES FEATURE_BLACKBOX +#define DEFAULT_FEATURES (FEATURE_TRANSPONDER | FEATURE_BLACKBOX | FEATURE_RSSI_ADC | FEATURE_CURRENT_METER | FEATURE_TELEMETRY) #define SPEKTRUM_BIND // USART3, diff --git a/src/main/target/SPRACINGF3/target.mk b/src/main/target/SPRACINGF3/target.mk index 5b3a330295..3668a83e72 100644 --- a/src/main/target/SPRACINGF3/target.mk +++ b/src/main/target/SPRACINGF3/target.mk @@ -3,10 +3,22 @@ FEATURES = ONBOARDFLASH TARGET_SRC = \ drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6050.c \ drivers/barometer_ms5611.c \ drivers/barometer_bmp085.c \ drivers/barometer_bmp280.c \ drivers/compass_ak8975.c \ drivers/compass_hmc5883l.c +ifeq ($(TARGET), FLIP32F3OSD) +TARGET_SRC += \ + drivers/accgyro_mpu6500.c +else +ifeq ($(TARGET), ZCOREF3) +TARGET_SRC += \ + drivers/accgyro_mpu6500.c \ + drivers/accgyro_spi_mpu6500.c +else +TARGET_SRC += \ + drivers/accgyro_mpu6050.c +endif +endif diff --git a/src/main/target/ZCOREF3/target.c b/src/main/target/ZCOREF3/target.c deleted file mode 100644 index f85061242b..0000000000 --- a/src/main/target/ZCOREF3/target.c +++ /dev/null @@ -1,31 +0,0 @@ - -#include -#include - -#include -#include "drivers/io.h" - -#include "drivers/dma.h" -#include "drivers/timer.h" -#include "drivers/timer_def.h" - -const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { - DEF_TIM(TIM2, CH1, PA0, TIM_USE_PWM | TIM_USE_PPM, 0), // RC_CH1 - PA0 - *TIM2_CH1 - DEF_TIM(TIM2, CH2, PA1, TIM_USE_PWM, 0), // RC_CH2 - PA1 - *TIM2_CH2, TIM15_CH1N - DEF_TIM(TIM2, CH4, PB11, TIM_USE_PWM, 0), // RC_CH3 - PB11 - *TIM2_CH4, UART3_RX (AF7) - DEF_TIM(TIM2, CH3, PB10, TIM_USE_PWM, 0), // RC_CH4 - PB10 - *TIM2_CH3, UART3_TX (AF7) - DEF_TIM(TIM3, CH1, PB4, TIM_USE_PWM, 0), // RC_CH5 - PB4 - *TIM3_CH1 - DEF_TIM(TIM3, CH2, PB5, TIM_USE_PWM, 0), // RC_CH6 - PB5 - *TIM3_CH2 - DEF_TIM(TIM3, CH3, PB0, TIM_USE_PWM, 0), // RC_CH7 - PB0 - *TIM3_CH3, TIM1_CH2N, TIM8_CH2N - DEF_TIM(TIM3, CH4, PB1, TIM_USE_PWM, 0), // RC_CH8 - PB1 - *TIM3_CH4, TIM1_CH3N, TIM8_CH3N - DEF_TIM(TIM16, CH1, PA6, TIM_USE_MOTOR, 1), // PWM1 - PA6 - TIM3_CH1, TIM8_BKIN, TIM1_BKIN, *TIM16_CH1 - DEF_TIM(TIM17, CH1, PA7, TIM_USE_MOTOR, 1), // PWM2 - PA7 - TIM3_CH2, *TIM17_CH1, TIM1_CH1N, TIM8_CH1 - DEF_TIM(TIM4, CH1, PA11, TIM_USE_MOTOR, 1), // PWM3 - PA11 - DEF_TIM(TIM4, CH2, PA12, TIM_USE_MOTOR, 1), // PWM4 - PA12 - DEF_TIM(TIM4, CH3, PB8, TIM_USE_MOTOR, 1), // PWM5 - PB8 - DEF_TIM(TIM4, CH4, PB9, TIM_USE_MOTOR, 1), // PWM6 - PB9 - DEF_TIM(TIM15, CH1, PA2, TIM_USE_MOTOR, 1), // PWM7 - PA2 - DEF_TIM(TIM15, CH2, PA3, TIM_USE_MOTOR, 1), // PWM8 - PA3 - DEF_TIM(TIM1, CH1, PA8, TIM_USE_LED, 1), // GPIO_TIMER / LED_STRIP -}; - diff --git a/src/main/target/ZCOREF3/target.h b/src/main/target/ZCOREF3/target.h deleted file mode 100644 index db38c0bb12..0000000000 --- a/src/main/target/ZCOREF3/target.h +++ /dev/null @@ -1,107 +0,0 @@ -/* - * This file is part of Cleanflight. - * - * Cleanflight is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Cleanflight is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Cleanflight. If not, see . - */ - -#pragma once - -#define TARGET_BOARD_IDENTIFIER "ZCF3" - -#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT - -#define LED0 PB8 - -#define BEEPER PC15 -#define BEEPER_INVERTED - -#define EXTI15_10_CALLBACK_HANDLER_COUNT 1 - -#define USE_EXTI -#define MPU_INT_EXTI PC13 -#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 USE_GYRO_MPU6500 -#define USE_GYRO_SPI_MPU6500 -#define GYRO_MPU6500_ALIGN CW180_DEG - -#define ACC -#define USE_ACC_MPU6500 -#define USE_ACC_SPI_MPU6500 -#define ACC_MPU6500_ALIGN CW180_DEG - -#define BARO -#define USE_BARO_BMP280 - -#define USE_UART1 -#define USE_UART2 -#define USE_UART3 -#define SERIAL_PORT_COUNT 3 - -#define USE_ESCSERIAL -#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1 - -#define UART2_TX_PIN PA14 // PA14 / SWCLK -#define UART2_RX_PIN PA15 - -#define UART3_TX_PIN PB10 // PB10 (AF7) -#define UART3_RX_PIN PB11 // PB11 (AF7) - -#define USE_I2C -#define I2C_DEVICE (I2CDEV_1) // PB6/SCL, PB7/SDA - -#define USE_SPI -#define USE_SPI_DEVICE_1 // PB9,3,4,5 on AF5 SPI1 (MPU) -#define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5 SPI2 (SDCard) - -#define SPI1_NSS_PIN PB9 -#define SPI1_SCK_PIN PB3 -#define SPI1_MISO_PIN PB4 -#define SPI1_MOSI_PIN PB5 - -#define MPU6500_CS_PIN PB9 -#define MPU6500_SPI_INSTANCE SPI1 - -#define USE_FLASHFS -#define USE_FLASH_M25P16 - -#define M25P16_CS_PIN PB12 -#define M25P16_SPI_INSTANCE SPI2 - -#define BOARD_HAS_VOLTAGE_DIVIDER -#define USE_ADC -#define ADC_INSTANCE ADC2 -#define VBAT_ADC_PIN PA4 -#define CURRENT_METER_ADC_PIN PA5 -#define RSSI_ADC_PIN PB2 - -#define DEFAULT_RX_FEATURE FEATURE_RX_PPM -#define DEFAULT_FEATURES (FEATURE_TRANSPONDER | FEATURE_BLACKBOX | FEATURE_RSSI_ADC | FEATURE_CURRENT_METER | FEATURE_TELEMETRY) - -#define USE_SERIAL_4WAY_BLHELI_INTERFACE - -// IO - stm32f303cc in 48pin package -#define TARGET_IO_PORTA 0xffff -#define TARGET_IO_PORTB 0xffff -#define TARGET_IO_PORTC (BIT(13)|BIT(14)|BIT(15)) -#define TARGET_IO_PORTF (BIT(0)|BIT(1)|BIT(3)|BIT(4)) - -#define USABLE_TIMER_CHANNEL_COUNT 17 // PPM, 8 PWM, UART3 RX/TX, LED Strip -#define USED_TIMERS ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(15) | TIM_N(16) | TIM_N(17) ) - diff --git a/src/main/target/ZCOREF3/target.mk b/src/main/target/ZCOREF3/target.mk deleted file mode 100644 index 54107898fd..0000000000 --- a/src/main/target/ZCOREF3/target.mk +++ /dev/null @@ -1,9 +0,0 @@ -F3_TARGETS += $(TARGET) -FEATURES = ONBOARDFLASH - -TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/barometer_bmp280.c -