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

SRV_Channel: use method to get rc channels

This commit is contained in:
Peter Barker 2018-08-02 21:41:26 +10:00 committed by Peter Barker
parent ff36eb3aca
commit aa4cf5b40e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/SRV_Channel/SRV_Channel_aux.cpp
View File

@ -713,7 +713,7 @@ bool SRV_Channels::upgrade_parameters(const uint8_t rc_keys[14], uint16_t aux_ch
continue; continue;
} }
SRV_Channel &srv_chan = channels[i]; SRV_Channel &srv_chan = channels[i];
RC_Channel &rc_chan = RC_Channels::channels[i]; RC_Channel *rc_chan = rc().channel(i);
enum { enum {
FLAG_NONE=0, FLAG_NONE=0,
FLAG_IS_REVERSE=1, FLAG_IS_REVERSE=1,
@ -726,10 +726,10 @@ bool SRV_Channels::upgrade_parameters(const uint8_t rc_keys[14], uint16_t aux_ch
enum ap_var_type type; enum ap_var_type type;
uint8_t flags; uint8_t flags;
} mapping[] = { } mapping[] = {
{ 0, &srv_chan.servo_min, &rc_chan.radio_min, AP_PARAM_INT16, FLAG_NONE }, { 0, &srv_chan.servo_min, &rc_chan->radio_min, AP_PARAM_INT16, FLAG_NONE },
{ 1, &srv_chan.servo_trim, &rc_chan.radio_trim, AP_PARAM_INT16, FLAG_NONE }, { 1, &srv_chan.servo_trim, &rc_chan->radio_trim, AP_PARAM_INT16, FLAG_NONE },
{ 2, &srv_chan.servo_max, &rc_chan.radio_max, AP_PARAM_INT16, FLAG_NONE }, { 2, &srv_chan.servo_max, &rc_chan->radio_max, AP_PARAM_INT16, FLAG_NONE },
{ 3, &srv_chan.reversed, &rc_chan.reversed, AP_PARAM_INT8, FLAG_IS_REVERSE }, { 3, &srv_chan.reversed, &rc_chan->reversed, AP_PARAM_INT8, FLAG_IS_REVERSE },
{ 1, &srv_chan.function, nullptr, AP_PARAM_INT8, FLAG_AUX_ONLY }, { 1, &srv_chan.function, nullptr, AP_PARAM_INT8, FLAG_AUX_ONLY },
}; };
bool is_aux = aux_channel_mask & (1U<<i); bool is_aux = aux_channel_mask & (1U<<i);