Browse Source

Blimp: correct compilation for do_aux_function sig change

zr-v5.1
Peter Barker 4 years ago committed by Peter Barker
parent
commit
40bc087359
  1. 7
      Blimp/RC_Channel.cpp
  2. 2
      Blimp/RC_Channel.h

7
Blimp/RC_Channel.cpp

@ -104,7 +104,7 @@ void RC_Channel_Blimp::do_aux_function_armdisarm(const AuxSwitchPos ch_flag) @@ -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 @@ -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

2
Blimp/RC_Channel.h

@ -12,7 +12,7 @@ public: @@ -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:

Loading…
Cancel
Save