Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-15 12:25:20 +03:00
Code Issues Wiki Activity

Camera control. Added forced OSD timeout so camera menues are alone on display.

Browse source
This commit is contained in:
Anders Hoglund 2017-10-07 00:07:53 +02:00
parent 36c91c76f6
commit 31e4f8ab4f
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/drivers/camera_control.c
View file

@ -56,6 +56,9 @@
#define CAMERA_CONTROL_PIN NONE #define CAMERA_CONTROL_PIN NONE
#endif #endif
#ifdef OSD
#include "io/osd.h"
#endif
PG_REGISTER_WITH_RESET_TEMPLATE(cameraControlConfig_t, cameraControlConfig, PG_CAMERA_CONTROL_CONFIG, 0); PG_REGISTER_WITH_RESET_TEMPLATE(cameraControlConfig_t, cameraControlConfig, PG_CAMERA_CONTROL_CONFIG, 0);
@ -190,6 +193,11 @@ void cameraControlKeyPress(cameraControlKey_e key, uint32_t holdDurationMs)
(void) holdDurationMs; (void) holdDurationMs;
#endif #endif
#ifdef OSD
// Force OSD timeout so we are alone on the display.
resumeRefreshAt = 0;
#endif
if (CAMERA_CONTROL_MODE_HARDWARE_PWM == cameraControlConfig()->mode) { if (CAMERA_CONTROL_MODE_HARDWARE_PWM == cameraControlConfig()->mode) {
#ifdef CAMERA_CONTROL_HARDWARE_PWM_AVAILABLE #ifdef CAMERA_CONTROL_HARDWARE_PWM_AVAILABLE
*cameraControlRuntime.channel.ccr = lrintf(dutyCycle * cameraControlRuntime.period); *cameraControlRuntime.channel.ccr = lrintf(dutyCycle * cameraControlRuntime.period);