Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-09 09:28:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

ArduCopter: move to AuxFuncTrigger structure

Browse Source
This commit is contained in:
Iampete1 2024-12-13 21:15:46 +00:00
parent 2a902bd9b9
commit 37a9a51383
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ArduCopter/RC_Channel.cpp
View File

@ -140,7 +140,7 @@ void RC_Channel_Copter::init_aux_function(const AUX_FUNC ch_option, const AuxSwi
case AUX_FUNC::CUSTOM_CONTROLLER: case AUX_FUNC::CUSTOM_CONTROLLER:
case AUX_FUNC::WEATHER_VANE_ENABLE: case AUX_FUNC::WEATHER_VANE_ENABLE:
case AUX_FUNC::TRANSMITTER_TUNING: case AUX_FUNC::TRANSMITTER_TUNING:
run_aux_function(ch_option, ch_flag, AuxFuncTriggerSource::INIT); run_aux_function(ch_option, ch_flag, AuxFuncTrigger::Source::INIT);
break; break;
default: default:
RC_Channel::init_aux_function(ch_option, ch_flag); RC_Channel::init_aux_function(ch_option, ch_flag);
@ -169,8 +169,11 @@ void RC_Channel_Copter::do_aux_function_change_mode(const Mode::Number mode,
} }
// do_aux_function - implement the function invoked by auxiliary switches // do_aux_function - implement the function invoked by auxiliary switches
bool RC_Channel_Copter::do_aux_function(const AUX_FUNC ch_option, const AuxSwitchPos ch_flag) bool RC_Channel_Copter::do_aux_function(const AuxFuncTrigger &trigger)
{ {
const AUX_FUNC &ch_option = trigger.func;
const AuxSwitchPos &ch_flag = trigger.pos;
switch(ch_option) { switch(ch_option) {
case AUX_FUNC::FLIP: case AUX_FUNC::FLIP:
// flip if switch is on, positive throttle and we're actually flying // flip if switch is on, positive throttle and we're actually flying
@ -668,7 +671,7 @@ bool RC_Channel_Copter::do_aux_function(const AUX_FUNC ch_option, const AuxSwitc
break; break;
default: default:
return RC_Channel::do_aux_function(ch_option, ch_flag); return RC_Channel::do_aux_function(trigger);
} }
return true; return true;
} }

2
ArduCopter/RC_Channel.h
View File

@ -12,7 +12,7 @@ public:
protected: protected:
void init_aux_function(AUX_FUNC ch_option, AuxSwitchPos) override; void init_aux_function(AUX_FUNC ch_option, AuxSwitchPos) override;
bool do_aux_function(AUX_FUNC ch_option, AuxSwitchPos) override; bool do_aux_function(const AuxFuncTrigger &trigger) override;
private: private: