Merge pull request #4293 from AndersHoglund/camosd_fix
Camera control. Added forced OSD timeout so camera menues are alone on display.
This commit is contained in:
commit
512f2c22e0
|
@ -56,6 +56,9 @@
|
|||
#define CAMERA_CONTROL_PIN NONE
|
||||
#endif
|
||||
|
||||
#ifdef OSD
|
||||
#include "io/osd.h"
|
||||
#endif
|
||||
|
||||
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;
|
||||
#endif
|
||||
|
||||
#ifdef OSD
|
||||
// Force OSD timeout so we are alone on the display.
|
||||
resumeRefreshAt = 0;
|
||||
#endif
|
||||
|
||||
if (CAMERA_CONTROL_MODE_HARDWARE_PWM == cameraControlConfig()->mode) {
|
||||
#ifdef CAMERA_CONTROL_HARDWARE_PWM_AVAILABLE
|
||||
*cameraControlRuntime.channel.ccr = lrintf(dutyCycle * cameraControlRuntime.period);
|
||||
|
|
Loading…
Reference in New Issue