Undefined camera control pin to resolved timer collision
This commit is contained in:
parent
805b2f4b1e
commit
5e398be295
|
@ -28,7 +28,7 @@
|
|||
#include "drivers/timer_def.h"
|
||||
|
||||
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
|
||||
DEF_TIM(TIM1, CH3, PE13, TIM_USE_PPM, 0, 1), // PPM / CAM_CONTROL, DMA2_ST6
|
||||
DEF_TIM(TIM1, CH3, PE13, TIM_USE_PPM, 0, 1), // PPM, DMA2_ST6
|
||||
|
||||
DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), // M1 , DMA1_ST7
|
||||
DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), // M2 , DMA1_ST2
|
||||
|
@ -37,6 +37,6 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
|
|||
DEF_TIM(TIM8, CH4, PC9, TIM_USE_MOTOR, 0, 0), // M5 , DMA2_ST7
|
||||
DEF_TIM(TIM5, CH4, PA3, TIM_USE_MOTOR, 0, 0), // M6 , DMA1_ST1
|
||||
|
||||
DEF_TIM(TIM4, CH1, PD12, TIM_USE_LED, 0, 0), // LED_TRIP , DMA1_ST0
|
||||
DEF_TIM(TIM4, CH1, PD12, TIM_USE_LED, 0, 0), // LED_TRIP, DMA1_ST0
|
||||
};
|
||||
|
||||
|
|
|
@ -34,9 +34,6 @@
|
|||
#define USE_ACC
|
||||
#define USE_GYRO
|
||||
|
||||
//define camera control
|
||||
#define CAMERA_CONTROL_PIN PE13
|
||||
|
||||
// ICM-20689
|
||||
#define USE_ACC_SPI_ICM20689
|
||||
#define USE_GYRO_SPI_ICM20689
|
||||
|
|
Loading…
Reference in New Issue