rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5307 from rotcehdnih/FPVMODELF7 

Add FPVMODELF7 Target to replace BetaflightF7 Target
This commit is contained in:
Michael Keller 2018-03-02 04:12:40 +13:00 committed by GitHub
parent a20bcbadd4 89f8a377c9
commit dc58ddebd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 63 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
make/targets.mk
View File

@ -65,6 +65,7 @@ GROUP_2_TARGETS := \
FF_PIKOBLX \
FF_PIKOF4 \
FF_RADIANCE \
FPVM_BETAFLIGHTF7 \
FRSKYF3 \
FRSKYF4 \
FURYF3 \

1
src/main/target/OMNIBUSF7/FPVM_BETAFLIGHTF7.mk Normal file
View File

@ -0,0 +1 @@
#FPVM_BETAFLIGHTF7 Target file

5
src/main/target/OMNIBUSF7/target.c
View File

@ -23,6 +23,10 @@
#include "drivers/timer_def.h"
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
#ifdef FPVM_BETAFLIGHTF7
DEF_TIM(TIM8, CH3, PC8, TIM_USE_ANY, 0, 0), // USED FOR CAMERA CONTROL
#endif
DEF_TIM(TIM1, CH3, PE13, TIM_USE_NONE, 0, 1 ), // RC1 / PPM, unusable
DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0 ), // M1
@ -40,4 +44,5 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
// For ESC serial
DEF_TIM(TIM9, CH1, PA2, TIM_USE_NONE, 0, 0 ), // UART2_TX (unwired)
};

60
src/main/target/OMNIBUSF7/target.h
View File

@ -15,9 +15,12 @@
#pragma once
//OMNIBUSF7 TARGETS-------------------------
#define USE_TARGET_CONFIG
#ifdef OMNIBUSF7V2
#if defined (FPVM_BETAFLIGHTF7)
#define TARGET_BOARD_IDENTIFIER "FBF7"
#define USBD_PRODUCT_STRING "FPVM_BETAFLIGHTF7"
#elif defined (OMNIBUSF7V2)
#define TARGET_BOARD_IDENTIFIER "OB72"
#define USBD_PRODUCT_STRING "OmnibusF7V2"
#else
@ -25,15 +28,22 @@
#define USBD_PRODUCT_STRING "OmnibusF7"
#endif
//LED & BEEPER------------------------------
#define LED0_PIN PE0
#define BEEPER PD15
#define BEEPER_INVERTED
//CAMERA CONTROL----------------------------
#ifdef FPVM_BETAFLIGHTF7
//define camera control
#define CAMERA_CONTROL_PIN PC8 // Camera control.
#endif
//GYRO & ACC--------------------------------
#define USE_ACC
#define USE_GYRO
#define USE_DUAL_GYRO
// ICM-20608-G
#define USE_ACC_MPU6500
#define USE_ACC_SPI_MPU6500
@ -48,7 +58,7 @@
#define USE_GYRO_SPI_MPU6000
//#define MPU_INT_EXTI PD0
#ifdef OMNIBUSF7V2
#if defined(OMNIBUSF7V2) || defined(FPVM_BETAFLIGHTF7)
#define MPU6000_CS_PIN SPI1_NSS_PIN
#define MPU6000_SPI_INSTANCE SPI1
#define MPU6500_CS_PIN SPI3_NSS_PIN
@ -57,6 +67,8 @@
#define GYRO_0_CS_PIN MPU6500_CS_PIN
#define GYRO_MPU6500_ALIGN CW90_DEG
#define ACC_MPU6500_ALIGN CW90_DEG
#define GYRO_MPU6000_ALIGN CW90_DEG
#define ACC_MPU6000_ALIGN CW90_DEG
#else
#define MPU6000_CS_PIN SPI3_NSS_PIN
#define MPU6000_SPI_INSTANCE SPI3
@ -68,9 +80,9 @@
// TODO: dual gyro support
//#define USE_MPU_DATA_READY_SIGNAL
#define USE_EXTI
//UARTS-------------------------------------
#define USE_VCP
#define VBUS_SENSING_PIN PC4
@ -109,6 +121,7 @@
#define USE_ESCSERIAL
#define ESCSERIAL_TIMER_TX_PIN PA2 // (Unwired UART2_TX)
//SPI---------------------------------------
#define USE_SPI
#define USE_SPI_DEVICE_1
#define USE_SPI_DEVICE_2
@ -135,13 +148,24 @@
#define SPI4_MISO_PIN PE5
#define SPI4_MOSI_PIN PE6
//OSD----------------------------------------
#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN SPI2_NSS_PIN
#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz
#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST)
#ifdef FPVM_BETAFLIGHTF7
//FLASH--------------------------------------
#define M25P16_CS_PIN SPI4_NSS_PIN
#define M25P16_SPI_INSTANCE SPI4
#define USE_FLASHFS
#define USE_FLASH_M25P16
#else
//SD-----------------------------------------
#define USE_SDCARD
#define SDCARD_DETECT_INVERTED
#define SDCARD_DETECT_PIN PE3
@ -156,12 +180,16 @@
#define SDCARD_DMA_STREAM_TX_FULL DMA2_Stream1
#define SDCARD_DMA_CHANNEL 4
#endif
//I2C---------------------------------------
#define USE_I2C
#define USE_I2C_DEVICE_2
#define I2C_DEVICE (I2CDEV_2)
#define I2C2_SCL NONE // PB10 (UART3_TX)
#define I2C2_SDA NONE // PB11 (UART3_RX)
//BARO & Mag--------------------------------
#define USE_BARO
#define USE_BARO_BMP280
#define USE_BARO_SPI_BMP280
@ -172,7 +200,7 @@
#define USE_MAG_HMC5883
#define SENSORS_SET (SENSOR_ACC | SENSOR_BARO)
//ADC---------------------------------------
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
@ -182,22 +210,34 @@
#define VBAT_ADC_PIN PC3
#define RSSI_ADC_PIN PC5
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
//DEFAULTS----------------------------------
#define DEFAULT_FEATURES (FEATURE_OSD)
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#ifdef FPVM_BETAFLIGHTF7
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#define SERIALRX_UART SERIAL_PORT_USART6
#define SERIALRX_PROVIDER SERIALRX_SBUS
#define ESC_SENSOR_UART SERIAL_PORT_USART1
#else
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
#define SERIALRX_UART SERIAL_PORT_USART2
#define SERIALRX_PROVIDER SERIALRX_SBUS
#define ESC_SENSOR_UART SERIAL_PORT_USART7
#endif
#define USE_SERIAL_4WAY_BLHELI_INTERFACE
//PORT'S & TIMERS---------------------------
#define TARGET_IO_PORTA 0xffff
#define TARGET_IO_PORTB 0xffff
#define TARGET_IO_PORTC 0xffff
#define TARGET_IO_PORTD 0xffff
#define TARGET_IO_PORTE 0xffff
#ifdef FPVM_BETAFLIGHTF7
#define USABLE_TIMER_CHANNEL_COUNT 12
#else
#define USABLE_TIMER_CHANNEL_COUNT 11
#endif
#define USED_TIMERS ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(8) | TIM_N(9) )

7
src/main/target/OMNIBUSF7/target.mk
View File

@ -1,5 +1,9 @@
F7X5XG_TARGETS += $(TARGET)
FEATURES += SDCARD VCP
ifeq ($(TARGET), FPVM_BETAFLIGHTF7)
FEATURES = VCP ONBOARDFLASH
else
FEATURES = VCP SDCARD
endif
TARGET_SRC = \
drivers/accgyro/accgyro_mpu.c \
@ -7,6 +11,7 @@ TARGET_SRC = \
drivers/accgyro/accgyro_spi_mpu6500.c \
drivers/accgyro/accgyro_spi_mpu6000.c \
drivers/barometer/barometer_bmp280.c \
drivers/barometer/barometer_ms5611.c \
drivers/compass/compass_hmc5883l.c \
drivers/light_ws2811strip.c \
drivers/light_ws2811strip_hal.c \