fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-16 13:10:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

mixer_module/tap_esc: fix usage of constrain() on input

Browse Source 
I changed the input constraint in #15349 but screwed up the usage
because I was convinced it's püass by reference. I'll double check
for sure next time.
This commit is contained in:
Matthias Grob
2020-07-20 09:01:48 +02:00
committed by Beat Küng
parent 650b601206
commit 987826f1d4
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/tap_esc/tap_esc.cpp
+1 -6
View File
@@ -639,12 +639,7 @@ int TAP_ESC::control_callback(uint8_t control_group, uint8_t control_index, floa
input = _controls[control_group].control[control_index];
/* limit control input */
if (input > 1.0f) {
input = 1.0f;
} else if (input < -1.0f) {
input = -1.0f;
}
input = math::constrain(input, -1.f, 1.f);
/* throttle not arming - mark throttle input as invalid */
if (_armed.prearmed && !_armed.armed) {
src/lib/mixer_module/mixer_module.cpp
+1 -1
View File
@@ -499,7 +499,7 @@ int MixingOutput::controlCallback(uintptr_t handle, uint8_t control_group, uint8
input = output->_controls[control_group].control[control_index];
/* limit control input */
math::constrain(input, -1.f, 1.f);
input = math::constrain(input, -1.f, 1.f);
/* motor spinup phase - lock throttle to zero */
if (output->_output_limit.state == OUTPUT_LIMIT_STATE_RAMP) {