From aa4cf5b40ee2da9db564d020334a0ab7caa1f16a Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 2 Aug 2018 21:41:26 +1000 Subject: [PATCH] SRV_Channel: use method to get rc channels --- libraries/SRV_Channel/SRV_Channel_aux.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/SRV_Channel/SRV_Channel_aux.cpp b/libraries/SRV_Channel/SRV_Channel_aux.cpp index ee75089c5a..b743ec0b4f 100644 --- a/libraries/SRV_Channel/SRV_Channel_aux.cpp +++ b/libraries/SRV_Channel/SRV_Channel_aux.cpp @@ -713,7 +713,7 @@ bool SRV_Channels::upgrade_parameters(const uint8_t rc_keys[14], uint16_t aux_ch continue; } SRV_Channel &srv_chan = channels[i]; - RC_Channel &rc_chan = RC_Channels::channels[i]; + RC_Channel *rc_chan = rc().channel(i); enum { FLAG_NONE=0, 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; uint8_t flags; } mapping[] = { - { 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 }, - { 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 }, + { 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 }, + { 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 }, { 1, &srv_chan.function, nullptr, AP_PARAM_INT8, FLAG_AUX_ONLY }, }; bool is_aux = aux_channel_mask & (1U<