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

RC_Channel: extend channel mapping to 16 channels

Browse Source 
this gives more flexibility, no reason to limit it to 8
This commit is contained in:
Andrew Tridgell 2016-04-23 21:01:07 +10:00
parent 38a7bfd81f
commit 54f7aeed83
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/RC_Channel/RC_Channel_aux.cpp
View File

@ -35,7 +35,7 @@ RC_Channel_aux::output_ch(void)
case k_manual: // manual
radio_out = radio_in;
break;
case k_rcin1 ... k_rcin8: // rc pass-thru
case k_rcin1 ... k_rcin16: // rc pass-thru
radio_out = hal.rcin->read(function-k_rcin1);
break;
case k_motor1 ... k_motor8:
@ -345,7 +345,7 @@ RC_Channel_aux::set_servo_limit(RC_Channel_aux::Aux_servo_function_t function, R
// also have to override radio_in
ch->radio_in = pwm;
}
if (ch->function.get() >= k_rcin1 && ch->function.get() <= k_rcin8) {
if (ch->function.get() >= k_rcin1 && ch->function.get() <= k_rcin16) {
// save for k_rcin*
ch->radio_in = pwm;
}

8
libraries/RC_Channel/RC_Channel_aux.h
View File

@ -82,6 +82,14 @@ public:
k_rcin6 = 56,
k_rcin7 = 57,
k_rcin8 = 58,
k_rcin9 = 59,
k_rcin10 = 60,
k_rcin11 = 61,
k_rcin12 = 62,
k_rcin13 = 63,
k_rcin14 = 64,
k_rcin15 = 65,
k_rcin16 = 66,
k_nr_aux_servo_functions ///< This must be the last enum value (only add new values _before_ this one)
} Aux_servo_function_t;