Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-05 14:17:20 +08:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

camera_trigger : cleanup pwm interface

Browse Source
This commit is contained in:
Mohammed Kabir
2017-04-04 19:24:14 +02:00
committed by Lorenz Meier
parent ea890ecdd3
commit 6d3c16a35b
2 changed files with 18 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/camera_trigger/interfaces/src/pwm.cpp
+8 -38
View File
@@ -75,20 +75,10 @@ void CameraInterfacePWM::trigger(bool enable)
return; return;
} }
if (enable) {
// Set all valid pins to shoot level
for (unsigned i = 0; i < sizeof(_pins) / sizeof(_pins[0]); i = i + 2) { for (unsigned i = 0; i < sizeof(_pins) / sizeof(_pins[0]); i = i + 2) {
if (_pins[i] >= 0 && _pins[i + 1] >= 0) { if (_pins[i] >= 0 && _pins[i + 1] >= 0) {
up_pwm_trigger_set(_pins[i + 1], math::constrain(PWM_CAMERA_INSTANT_SHOOT, 1000, 2000)); // Set all valid pins to shoot or neutral levels
} up_pwm_trigger_set(_pins[i + 1], math::constrain(enable ? PWM_CAMERA_INSTANT_SHOOT : PWM_CAMERA_NEUTRAL, 1000, 2000));
}
} else {
// Set all valid pins back to neutral level
for (unsigned i = 0; i < sizeof(_pins) / sizeof(_pins[0]); i = i + 2) {
if (_pins[i] >= 0 && _pins[i + 1] >= 0) {
up_pwm_trigger_set(_pins[i + 1], math::constrain(PWM_CAMERA_NEUTRAL, 1000, 2000));
}
} }
} }
} }
@@ -101,46 +91,26 @@ void CameraInterfacePWM::keep_alive(bool signal_on)
return; return;
} }
if (signal_on) {
// Set channel 2 pin to keep_alive signal
for (unsigned i = 0; i < sizeof(_pins) / sizeof(_pins[0]); i = i + 2) { for (unsigned i = 0; i < sizeof(_pins) / sizeof(_pins[0]); i = i + 2) {
if (_pins[i] >= 0 && _pins[i + 1] >= 0) { if (_pins[i] >= 0 && _pins[i + 1] >= 0) {
up_pwm_trigger_set(_pins[i], math::constrain(PWM_2_CAMERA_KEEP_ALIVE, 1000, 2000)); // Set channel 2 pin to keep_alive or netural signal
} up_pwm_trigger_set(_pins[i], math::constrain(signal_on ? PWM_2_CAMERA_KEEP_ALIVE : PWM_CAMERA_NEUTRAL, 1000, 2000));
}
} else {
// Set channel 2 pin to neutral signal
for (unsigned i = 0; i < sizeof(_pins) / sizeof(_pins[0]); i = i + 2) {
if (_pins[i] >= 0 && _pins[i + 1] >= 0) {
up_pwm_trigger_set(_pins[i], math::constrain(PWM_CAMERA_NEUTRAL, 1000, 2000));
}
} }
} }
} }
void CameraInterfacePWM::turn_on_off(bool enable) void CameraInterfacePWM::turn_on_off(bool enable)
{ {
if (enable) {
// For now, set channel one on neutral upon startup.
for (unsigned i = 0; i < sizeof(_pins) / sizeof(_pins[0]); i = i + 2) { for (unsigned i = 0; i < sizeof(_pins) / sizeof(_pins[0]); i = i + 2) {
if (_pins[i] >= 0 && _pins[i + 1] >= 0) { if (_pins[i] >= 0 && _pins[i + 1] >= 0) {
// For now, set channel one to neutral upon startup.
up_pwm_trigger_set(_pins[i + 1], math::constrain(PWM_CAMERA_NEUTRAL, 1000, 2000)); up_pwm_trigger_set(_pins[i + 1], math::constrain(PWM_CAMERA_NEUTRAL, 1000, 2000));
up_pwm_trigger_set(_pins[i], math::constrain(PWM_2_CAMERA_ON_OFF, 1000, 2000)); up_pwm_trigger_set(_pins[i], math::constrain(enable ? PWM_2_CAMERA_ON_OFF : PWM_CAMERA_NEUTRAL, 1000, 2000));
} }
} }
} else { if (!enable) { _camera_is_on = !_camera_is_on; }
// For now, set channel one on neutral upon startup.
for (unsigned i = 0; i < sizeof(_pins) / sizeof(_pins[0]); i = i + 2) {
if (_pins[i] >= 0 && _pins[i + 1] >= 0) {
up_pwm_trigger_set(_pins[i + 1], math::constrain(PWM_CAMERA_NEUTRAL, 1000, 2000));
up_pwm_trigger_set(_pins[i], math::constrain(PWM_CAMERA_NEUTRAL, 1000, 2000));
}
}
_camera_is_on = !_camera_is_on;
}
} }
void CameraInterfacePWM::info() void CameraInterfacePWM::info()
src/drivers/stm32/drv_pwm_trigger.c
+3 -3
View File
@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
* *
* Copyright (C) 2012, 2017 PX4 Development Team. All rights reserved. * Copyright (C) 2017 PX4 Development Team. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -80,7 +80,7 @@ int up_pwm_trigger_init(uint32_t channel_mask)
} }
} }
/* enable the timers */ /* Enable the timers */
up_pwm_trigger_arm(true); up_pwm_trigger_arm(true);
return OK; return OK;
@@ -88,7 +88,7 @@ int up_pwm_trigger_init(uint32_t channel_mask)
void up_pwm_trigger_deinit() void up_pwm_trigger_deinit()
{ {
/* disable the timers */ /* Disable the timers */
up_pwm_trigger_arm(false); up_pwm_trigger_arm(false);
/* Deinit channels */ /* Deinit channels */