Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SRV_Channel: fix scaled passthrough of ranges

This commit is contained in:
Randy Mackay 2023-11-13 20:13:05 +09:00 committed by Andrew Tridgell
parent 901280902a
commit 265f19b396
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/SRV_Channel/SRV_Channel_aux.cpp
View File

@ -60,7 +60,15 @@ void SRV_Channel::output_ch(void)
int16_t radio_in = c->get_radio_in(); int16_t radio_in = c->get_radio_in();
if (passthrough_mapped) { if (passthrough_mapped) {
if (rc().has_valid_input()) { if (rc().has_valid_input()) {
switch (c->get_type()) {
case RC_Channel::ControlType::ANGLE:
radio_in = pwm_from_angle(c->norm_input_dz() * 4500); radio_in = pwm_from_angle(c->norm_input_dz() * 4500);
break;
case RC_Channel::ControlType::RANGE:
// convert RC normalised input from -1 to +1 range to 0 to +1 and output as range
radio_in = pwm_from_range((c->norm_input_ignore_trim() + 1.0) * 0.5 * 4500);
break;
}
} else { } else {
// no valid input. If we are in radio // no valid input. If we are in radio
// failsafe then go to trim values (if // failsafe then go to trim values (if