Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-27 18:27:05 +08:00
Code Issues Actions 22 Packages Projects Releases Wiki Activity

Rename trigger argument for clarity

Browse Source
This commit is contained in:
David Sidrane
2018-06-15 01:03:31 -10:00
committed by Beat Küng
parent 4e5e0c6921
commit afc8fe39df
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/camera_trigger/interfaces/src/camera_interface.h
+1 -1
View File
@@ -27,7 +27,7 @@ public:
* trigger the camera * trigger the camera
* @param enable * @param enable
*/ */
virtual void trigger(bool enable) {} virtual void trigger(bool trigger_on_true) {}
/** /**
* send command to turn the camera on/off * send command to turn the camera on/off
src/drivers/camera_trigger/interfaces/src/gpio.h
+1 -1
View File
@@ -18,7 +18,7 @@ public:
CameraInterfaceGPIO(); CameraInterfaceGPIO();
virtual ~CameraInterfaceGPIO(); virtual ~CameraInterfaceGPIO();
void trigger(bool enable); void trigger(bool trigger_on_true);
void info(); void info();
src/drivers/camera_trigger/interfaces/src/pwm.cpp
+2 -2
View File
@@ -46,12 +46,12 @@ void CameraInterfacePWM::setup()
} }
void CameraInterfacePWM::trigger(bool enable) void CameraInterfacePWM::trigger(bool trigger_on_true)
{ {
for (unsigned i = 0; i < arraySize(_pins); i++) { for (unsigned i = 0; i < arraySize(_pins); i++) {
if (_pins[i] >= 0) { if (_pins[i] >= 0) {
// Set all valid pins to shoot or neutral levels // Set all valid pins to shoot or neutral levels
up_pwm_trigger_set(_pins[i], math::constrain(enable ? PWM_CAMERA_SHOOT : PWM_CAMERA_NEUTRAL, 1000, 2000)); up_pwm_trigger_set(_pins[i], math::constrain(trigger_on_true ? PWM_CAMERA_SHOOT : PWM_CAMERA_NEUTRAL, 1000, 2000));
} }
} }
} }
src/drivers/camera_trigger/interfaces/src/pwm.h
+1 -1
View File
@@ -20,7 +20,7 @@ public:
CameraInterfacePWM(); CameraInterfacePWM();
virtual ~CameraInterfacePWM(); virtual ~CameraInterfacePWM();
void trigger(bool enable); void trigger(bool trigger_on_true);
void info(); void info();
src/drivers/camera_trigger/interfaces/src/seagull_map2.cpp
+2 -2
View File
@@ -52,7 +52,7 @@ void CameraInterfaceSeagull::setup()
PX4_ERR("Bad pin configuration - Seagull MAP2 requires 2 consecutive pins for control."); PX4_ERR("Bad pin configuration - Seagull MAP2 requires 2 consecutive pins for control.");
} }
void CameraInterfaceSeagull::trigger(bool enable) void CameraInterfaceSeagull::trigger(bool trigger_on_true)
{ {
if (!_camera_is_on) { if (!_camera_is_on) {
@@ -62,7 +62,7 @@ void CameraInterfaceSeagull::trigger(bool enable)
for (unsigned i = 0; i < arraySize(_pins); i = i + 2) { for (unsigned i = 0; i < arraySize(_pins); i = i + 2) {
if (_pins[i] >= 0 && _pins[i + 1] >= 0) { if (_pins[i] >= 0 && _pins[i + 1] >= 0) {
// Set channel 1 to shoot or neutral levels // Set channel 1 to shoot or neutral levels
up_pwm_trigger_set(_pins[i + 1], enable ? PWM_1_CAMERA_INSTANT_SHOOT : PWM_CAMERA_NEUTRAL); up_pwm_trigger_set(_pins[i + 1], trigger_on_true ? PWM_1_CAMERA_INSTANT_SHOOT : PWM_CAMERA_NEUTRAL);
} }
} }
} }
src/drivers/camera_trigger/interfaces/src/seagull_map2.h
+1 -1
View File
@@ -18,7 +18,7 @@ public:
CameraInterfaceSeagull(); CameraInterfaceSeagull();
virtual ~CameraInterfaceSeagull(); virtual ~CameraInterfaceSeagull();
void trigger(bool enable); void trigger(bool trigger_on_true);
void send_keep_alive(bool enable); void send_keep_alive(bool enable);