aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SRV_Channel: limit pwm_from_angle return to +/-high_out

Browse Source
This commit is contained in:
Pierre Kancir 2017-03-05 12:21:49 +01:00 committed by Andrew Tridgell
parent f725e9f2b5
commit 67e79a30e8
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/SRV_Channel/SRV_Channel.cpp
View File

@ -87,12 +87,7 @@ uint16_t SRV_Channel::pwm_from_range(int16_t scaled_value) const
if (servo_max <= servo_min || high_out == 0) {
return servo_min;
}
if (scaled_value >= high_out) {
scaled_value = high_out;
}
if (scaled_value < 0) {
scaled_value = 0;
}
scaled_value = constrain_int16(scaled_value, 0, high_out);
if (reversed) {
scaled_value = high_out - scaled_value;
}
@ -105,6 +100,7 @@ uint16_t SRV_Channel::pwm_from_angle(int16_t scaled_value) const
if (reversed) {
scaled_value = -scaled_value;
}
scaled_value = constrain_int16(scaled_value, -high_out, high_out);
if (scaled_value > 0) {
return servo_trim + ((int32_t)scaled_value * (int32_t)(servo_max - servo_trim)) / (int32_t)high_out;
} else {