From 40bc087359694babccaf511a0b5871dca2af0757 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 31 Mar 2021 12:48:47 +1100 Subject: [PATCH] Blimp: correct compilation for do_aux_function sig change --- Blimp/RC_Channel.cpp | 7 ++++--- Blimp/RC_Channel.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Blimp/RC_Channel.cpp b/Blimp/RC_Channel.cpp index 0d8d9c7b4a..18374bb160 100644 --- a/Blimp/RC_Channel.cpp +++ b/Blimp/RC_Channel.cpp @@ -104,7 +104,7 @@ void RC_Channel_Blimp::do_aux_function_armdisarm(const AuxSwitchPos ch_flag) } // do_aux_function - implement the function invoked by auxiliary switches -void RC_Channel_Blimp::do_aux_function(const aux_func_t ch_option, const AuxSwitchPos ch_flag) +bool RC_Channel_Blimp::do_aux_function(const aux_func_t ch_option, const AuxSwitchPos ch_flag) { switch (ch_option) { @@ -183,9 +183,10 @@ void RC_Channel_Blimp::do_aux_function(const aux_func_t ch_option, const AuxSwit break; default: - RC_Channel::do_aux_function(ch_option, ch_flag); - break; + return RC_Channel::do_aux_function(ch_option, ch_flag); } + + return true; } // save_trim - adds roll and pitch trims from the radio to ahrs diff --git a/Blimp/RC_Channel.h b/Blimp/RC_Channel.h index 7734813cfc..51c48370cc 100644 --- a/Blimp/RC_Channel.h +++ b/Blimp/RC_Channel.h @@ -12,7 +12,7 @@ public: protected: void init_aux_function(aux_func_t ch_option, AuxSwitchPos) override; - void do_aux_function(aux_func_t ch_option, AuxSwitchPos) override; + bool do_aux_function(aux_func_t ch_option, AuxSwitchPos) override; private: