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

Blimp: correct compilation for do_aux_function sig change

This commit is contained in:
Peter Barker 2021-03-31 12:48:47 +11:00 committed by Peter Barker
parent 46f35a6910
commit 40bc087359
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Blimp/RC_Channel.cpp
View File

@ -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 // 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) { switch (ch_option) {
@ -183,9 +183,10 @@ void RC_Channel_Blimp::do_aux_function(const aux_func_t ch_option, const AuxSwit
break; break;
default: default:
RC_Channel::do_aux_function(ch_option, ch_flag); return RC_Channel::do_aux_function(ch_option, ch_flag);
break;
} }
return true;
} }
// save_trim - adds roll and pitch trims from the radio to ahrs // save_trim - adds roll and pitch trims from the radio to ahrs

2
Blimp/RC_Channel.h
View File

@ -12,7 +12,7 @@ public:
protected: protected:
void init_aux_function(aux_func_t ch_option, AuxSwitchPos) override; 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: private: