1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 04:45:24 +03:00

Added MERAKRCF405 target and MERAKRCF722 target

This commit is contained in:
Merak RC 2019-08-23 00:49:59 +08:00
parent bf06a135df
commit 57dcae950f
10 changed files with 238 additions and 68 deletions

View file

@ -31,17 +31,17 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM8, CH3, PC8, TIM_USE_PPM, 0, 0), // PPM
// Motors
DEF_TIM(TIM5, CH1, PA0, TIM_USE_MOTOR, 0, 0), // M1
DEF_TIM(TIM5, CH2, PA1, TIM_USE_MOTOR, 0, 0), // M2
DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), // M3
DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), // M4
DEF_TIM(TIM8, CH2, PC7, TIM_USE_MOTOR, 0, 0), // M5
DEF_TIM(TIM8, CH1, PC6, TIM_USE_MOTOR, 0, 0), // M6
DEF_TIM(TIM3, CH1, PC6, TIM_USE_MOTOR, 0, 0), // M1
DEF_TIM(TIM3, CH2, PC7, TIM_USE_MOTOR, 0, 0), // M2
DEF_TIM(TIM5, CH1, PA0, TIM_USE_MOTOR, 0, 0), // M3
DEF_TIM(TIM5, CH2, PA1, TIM_USE_MOTOR, 0, 0), // M4
DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), // M5
DEF_TIM(TIM1, CH3N, PB1, TIM_USE_MOTOR, 0, 0), // M6
// LED strip
DEF_TIM(TIM4, CH3, PB8, TIM_USE_LED, 0, 0), // LED
DEF_TIM(TIM4, CH3, PB8, TIM_USE_LED, 0, 0), // LED
//CAMERA_CONTROL
DEF_TIM(TIM11, CH1, PB9, TIM_USE_CAMERA_CONTROL, 0, 0), // CAMERA_CONTROL
DEF_TIM(TIM11, CH1, PB9, TIM_USE_CAMERA_CONTROL, 0, 0), // CAMERA_CONTROL
};
};

View file

@ -51,7 +51,6 @@
#define USE_ACC
#define USE_ACC_SPI_MPU6000
#define ACC_1_ALIGN CW0_DEG
// *************** BLACKBOX **************************
#define USE_SPI_DEVICE_1
@ -149,7 +148,7 @@
#define TARGET_IO_PORTA 0xffff
#define TARGET_IO_PORTB 0xffff
#define TARGET_IO_PORTC 0xffff
#define TARGET_IO_PORTD 0xffff
#define TARGET_IO_PORTD (BIT(2))
#define USABLE_TIMER_CHANNEL_COUNT 12
#define USED_TIMERS (TIM_N(1)|TIM_N(2)|TIM_N(3)|TIM_N(4)|TIM_N(5)|TIM_N(8)|TIM_N(9)|TIM_N(12))
#define USABLE_TIMER_CHANNEL_COUNT 9
#define USED_TIMERS (TIM_N(1)|TIM_N(3)|TIM_N(4)|TIM_N(5)|TIM_N(8)|TIM_N(11))

View file

@ -10,4 +10,5 @@ TARGET_SRC = \
drivers/compass/compass_ak8975.c \
drivers/compass/compass_hmc5883l.c \
drivers/compass/compass_qmc5883l.c \
drivers/compass/compass_lis3mdl.c \
drivers/max7456.c

View file

@ -31,17 +31,17 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM8, CH3, PC8, TIM_USE_PPM, 0, 0), // PPM
// Motors
DEF_TIM(TIM5, CH1, PA0, TIM_USE_MOTOR, 0, 0), // M1
DEF_TIM(TIM5, CH2, PA1, TIM_USE_MOTOR, 0, 0), // M2
DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), // M3
DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), // M4
DEF_TIM(TIM8, CH2, PC7, TIM_USE_MOTOR, 0, 0), // M5
DEF_TIM(TIM8, CH1, PC6, TIM_USE_MOTOR, 0, 0), // M6
DEF_TIM(TIM3, CH1, PC6, TIM_USE_MOTOR, 0, 0), // M1
DEF_TIM(TIM3, CH2, PC7, TIM_USE_MOTOR, 0, 0), // M2
DEF_TIM(TIM5, CH1, PA0, TIM_USE_MOTOR, 0, 0), // M3
DEF_TIM(TIM5, CH2, PA1, TIM_USE_MOTOR, 0, 0), // M4
DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), // M5
DEF_TIM(TIM1, CH3N, PB1, TIM_USE_MOTOR, 0, 0), // M6
// LED strip
DEF_TIM(TIM4, CH3, PB8, TIM_USE_LED, 0, 0), // LED
DEF_TIM(TIM4, CH3, PB8, TIM_USE_LED, 0, 0), // LED
//CAMERA_CONTROL
DEF_TIM(TIM11, CH1, PB9, TIM_USE_CAMERA_CONTROL, 0, 0), // CAMERA_CONTROL
DEF_TIM(TIM11, CH1, PB9, TIM_USE_CAMERA_CONTROL, 0, 0), // CAMERA_CONTROL
};
};

View file

@ -51,7 +51,6 @@
#define USE_ACC
#define USE_ACC_SPI_MPU6000
#define ACC_1_ALIGN CW0_DEG
// *************** BLACKBOX **************************
#define USE_SPI_DEVICE_1
@ -149,7 +148,7 @@
#define TARGET_IO_PORTA 0xffff
#define TARGET_IO_PORTB 0xffff
#define TARGET_IO_PORTC 0xffff
#define TARGET_IO_PORTD 0xffff
#define TARGET_IO_PORTD (BIT(2))
#define USABLE_TIMER_CHANNEL_COUNT 12
#define USED_TIMERS (TIM_N(1)|TIM_N(2)|TIM_N(3)|TIM_N(4)|TIM_N(5)|TIM_N(8)|TIM_N(9)|TIM_N(12))
#define USABLE_TIMER_CHANNEL_COUNT 9
#define USED_TIMERS (TIM_N(1)|TIM_N(3)|TIM_N(4)|TIM_N(5)|TIM_N(8)|TIM_N(11))

View file

@ -10,4 +10,5 @@ TARGET_SRC = \
drivers/compass/compass_ak8975.c \
drivers/compass/compass_hmc5883l.c \
drivers/compass/compass_qmc5883l.c \
drivers/compass/compass_lis3mdl.c \
drivers/max7456.c