From 839c733059c5bc63808fc21af5b7dd3d01aa8e50 Mon Sep 17 00:00:00 2001 From: jflyper Date: Tue, 3 Mar 2020 18:46:51 +0900 Subject: [PATCH] Use timerClock() instead of predefined constant --- src/main/drivers/camera_control.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/drivers/camera_control.c b/src/main/drivers/camera_control.c index 45c14fa76f..490f2f1ed9 100644 --- a/src/main/drivers/camera_control.c +++ b/src/main/drivers/camera_control.c @@ -30,14 +30,6 @@ #include "time.h" #include "pg/pg_ids.h" -#if defined(STM32F40_41xxx) -#define CAMERA_CONTROL_TIMER_HZ MHZ_TO_HZ(84) -#elif defined(STM32F7) -#define CAMERA_CONTROL_TIMER_HZ MHZ_TO_HZ(216) -#else -#define CAMERA_CONTROL_TIMER_HZ MHZ_TO_HZ(72) -#endif - #define CAMERA_CONTROL_PWM_RESOLUTION 128 #define CAMERA_CONTROL_SOFT_PWM_RESOLUTION 448 @@ -143,7 +135,7 @@ void cameraControlInit(void) IOConfigGPIOAF(cameraControlRuntime.io, IOCFG_AF_PP, timerHardware->alternateFunction); #endif - pwmOutConfig(&cameraControlRuntime.channel, timerHardware, CAMERA_CONTROL_TIMER_HZ, CAMERA_CONTROL_PWM_RESOLUTION, 0, cameraControlRuntime.inverted); + pwmOutConfig(&cameraControlRuntime.channel, timerHardware, timerClock(TIM6), CAMERA_CONTROL_PWM_RESOLUTION, 0, cameraControlRuntime.inverted); cameraControlRuntime.period = CAMERA_CONTROL_PWM_RESOLUTION; *cameraControlRuntime.channel.ccr = cameraControlRuntime.period;