From 897cdc834678226ce747a4a9100f7c51972d11c2 Mon Sep 17 00:00:00 2001 From: DieHertz Date: Thu, 27 Jul 2017 03:06:24 +0300 Subject: [PATCH 1/2] Fixed refactoring-induced error in camera_control.c --- src/main/drivers/camera_control.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/drivers/camera_control.c b/src/main/drivers/camera_control.c index 7339e1f7cb..b4bfaab321 100644 --- a/src/main/drivers/camera_control.c +++ b/src/main/drivers/camera_control.c @@ -28,11 +28,11 @@ #include "config/parameter_group_ids.h" #if defined(STM32F40_41xxx) -#define CAMERA_CONTROL_TIMER_MHZ 84 +#define CAMERA_CONTROL_TIMER_MHZ MHZ_TO_HZ(84) #elif defined(STM32F7) -#define CAMERA_CONTROL_TIMER_MHZ 108 +#define CAMERA_CONTROL_TIMER_MHZ MHZ_TO_HZ(216) #else -#define CAMERA_CONTROL_TIMER_MHZ 72 +#define CAMERA_CONTROL_TIMER_MHZ MHZ_TO_HZ(72) #endif #define CAMERA_CONTROL_PWM_RESOLUTION 128 @@ -109,8 +109,9 @@ void cameraControlInit() IOConfigGPIO(cameraControlRuntime.io, IOCFG_AF_PP); #endif - pwmOutConfig(&cameraControlRuntime.channel, timerHardware, CAMERA_CONTROL_TIMER_MHZ * 1000000, CAMERA_CONTROL_PWM_RESOLUTION, 0, 0); + pwmOutConfig(&cameraControlRuntime.channel, timerHardware, CAMERA_CONTROL_TIMER_MHZ, CAMERA_CONTROL_PWM_RESOLUTION, 0, 0); + cameraControlRuntime.period = CAMERA_CONTROL_PWM_RESOLUTION; *cameraControlRuntime.channel.ccr = cameraControlRuntime.period; cameraControlRuntime.enabled = true; #endif From 3f74aa7dc7f157514ed90084de418a271f91e40b Mon Sep 17 00:00:00 2001 From: Andrey Mironov Date: Thu, 27 Jul 2017 09:45:19 +0300 Subject: [PATCH 2/2] Changed name from MHZ to HZ Brought name in correspondence with units of measurement --- src/main/drivers/camera_control.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/drivers/camera_control.c b/src/main/drivers/camera_control.c index b4bfaab321..03852f53e8 100644 --- a/src/main/drivers/camera_control.c +++ b/src/main/drivers/camera_control.c @@ -28,11 +28,11 @@ #include "config/parameter_group_ids.h" #if defined(STM32F40_41xxx) -#define CAMERA_CONTROL_TIMER_MHZ MHZ_TO_HZ(84) +#define CAMERA_CONTROL_TIMER_HZ MHZ_TO_HZ(84) #elif defined(STM32F7) -#define CAMERA_CONTROL_TIMER_MHZ MHZ_TO_HZ(216) +#define CAMERA_CONTROL_TIMER_HZ MHZ_TO_HZ(216) #else -#define CAMERA_CONTROL_TIMER_MHZ MHZ_TO_HZ(72) +#define CAMERA_CONTROL_TIMER_HZ MHZ_TO_HZ(72) #endif #define CAMERA_CONTROL_PWM_RESOLUTION 128 @@ -109,7 +109,7 @@ void cameraControlInit() IOConfigGPIO(cameraControlRuntime.io, IOCFG_AF_PP); #endif - pwmOutConfig(&cameraControlRuntime.channel, timerHardware, CAMERA_CONTROL_TIMER_MHZ, CAMERA_CONTROL_PWM_RESOLUTION, 0, 0); + pwmOutConfig(&cameraControlRuntime.channel, timerHardware, CAMERA_CONTROL_TIMER_HZ, CAMERA_CONTROL_PWM_RESOLUTION, 0, 0); cameraControlRuntime.period = CAMERA_CONTROL_PWM_RESOLUTION; *cameraControlRuntime.channel.ccr = cameraControlRuntime.period;