From 5e398be295b408d0c2f498260d033545bb67f02b Mon Sep 17 00:00:00 2001 From: Andrey Mironov Date: Mon, 23 Jul 2018 20:01:44 +0300 Subject: [PATCH] Undefined camera control pin to resolved timer collision --- src/main/target/KAKUTEF7/target.c | 4 ++-- src/main/target/KAKUTEF7/target.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/target/KAKUTEF7/target.c b/src/main/target/KAKUTEF7/target.c index 615c7d723b..f62c4c20a3 100644 --- a/src/main/target/KAKUTEF7/target.c +++ b/src/main/target/KAKUTEF7/target.c @@ -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 }; diff --git a/src/main/target/KAKUTEF7/target.h b/src/main/target/KAKUTEF7/target.h index 2ead6064fe..4c425980d6 100644 --- a/src/main/target/KAKUTEF7/target.h +++ b/src/main/target/KAKUTEF7/target.h @@ -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