From c12a3330b803f5e16c1fcd9a6021ff072a4dfada Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Wed, 21 Apr 2021 08:17:37 -0700 Subject: [PATCH] camera_trigger: Use proper types --- .../camera_trigger/interfaces/src/camera_interface.cpp | 4 ++-- src/drivers/camera_trigger/interfaces/src/pwm.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/drivers/camera_trigger/interfaces/src/camera_interface.cpp b/src/drivers/camera_trigger/interfaces/src/camera_interface.cpp index 2224e926c9..799feaa3aa 100644 --- a/src/drivers/camera_trigger/interfaces/src/camera_interface.cpp +++ b/src/drivers/camera_trigger/interfaces/src/camera_interface.cpp @@ -52,8 +52,8 @@ void CameraInterface::get_pins() _pins[i] = -1; } - int pin_list = 0; - int pin_list_ex = 0; + int32_t pin_list = 0; + int32_t pin_list_ex = 0; if (_p_pin_ex != PARAM_INVALID) { param_get(_p_pin_ex, &pin_list_ex); diff --git a/src/drivers/camera_trigger/interfaces/src/pwm.cpp b/src/drivers/camera_trigger/interfaces/src/pwm.cpp index 136506b582..b3bb582810 100644 --- a/src/drivers/camera_trigger/interfaces/src/pwm.cpp +++ b/src/drivers/camera_trigger/interfaces/src/pwm.cpp @@ -73,7 +73,7 @@ void CameraInterfacePWM::setup() // Set neutral pulsewidths for (unsigned i = 0; i < arraySize(_pins); i++) { if (_pins[i] >= 0) { - up_pwm_trigger_set(_pins[i], math::constrain(_pwm_camera_neutral, 0, 2000)); + up_pwm_trigger_set(_pins[i], math::constrain(_pwm_camera_neutral, (int32_t) 0, (int32_t) 2000)); } } @@ -84,7 +84,8 @@ void CameraInterfacePWM::trigger(bool trigger_on_true) for (unsigned i = 0; i < arraySize(_pins); i++) { if (_pins[i] >= 0) { // Set all valid pins to shoot or neutral levels - up_pwm_trigger_set(_pins[i], math::constrain(trigger_on_true ? _pwm_camera_shoot : _pwm_camera_neutral, 0, 2000)); + up_pwm_trigger_set(_pins[i], math::constrain(trigger_on_true ? _pwm_camera_shoot : _pwm_camera_neutral, (int32_t) 0, + (int32_t) 2000)); } } }