From 4a688e59b27aa7f80ba7dc5548ae40d0a6d1088c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 13 Jan 2020 15:46:05 +1100 Subject: [PATCH] Sub: update for new SRV_Channels parameter conversion call --- ArduSub/Parameters.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ArduSub/Parameters.cpp b/ArduSub/Parameters.cpp index 7ec09fa80a..9e50fc7b5d 100644 --- a/ArduSub/Parameters.cpp +++ b/ArduSub/Parameters.cpp @@ -712,15 +712,5 @@ void Sub::convert_old_parameters() AP_Param::convert_old_parameters(&filt_conversion_info[i], 1.0f); } - const uint8_t old_rc_keys[14] = { Parameters::k_param_rc_1_old, Parameters::k_param_rc_2_old, - Parameters::k_param_rc_3_old, Parameters::k_param_rc_4_old, - Parameters::k_param_rc_5_old, Parameters::k_param_rc_6_old, - Parameters::k_param_rc_7_old, Parameters::k_param_rc_8_old, - Parameters::k_param_rc_9_old, Parameters::k_param_rc_10_old, - Parameters::k_param_rc_11_old, Parameters::k_param_rc_12_old, - Parameters::k_param_rc_13_old, Parameters::k_param_rc_14_old - }; - const uint16_t old_aux_chan_mask = 0x3FF0; - // note that we don't pass in rcmap as we don't want output channel functions changed based on rcmap - SRV_Channels::upgrade_parameters(old_rc_keys, old_aux_chan_mask, nullptr); + SRV_Channels::upgrade_parameters(); }