From 4b5553ac33812a4fe01ae180ba6f9726e35b8f76 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 14 Feb 2024 13:36:12 +1100 Subject: [PATCH] Rover: use AUX_FUNC instead of typedef aux_func_t --- Rover/RC_Channel.cpp | 4 ++-- Rover/RC_Channel.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Rover/RC_Channel.cpp b/Rover/RC_Channel.cpp index 9a89b66d61..eba8533119 100644 --- a/Rover/RC_Channel.cpp +++ b/Rover/RC_Channel.cpp @@ -26,7 +26,7 @@ void RC_Channel_Rover::mode_switch_changed(modeswitch_pos_t new_pos) } // init_aux_switch_function - initialize aux functions -void RC_Channel_Rover::init_aux_function(const aux_func_t ch_option, const AuxSwitchPos ch_flag) +void RC_Channel_Rover::init_aux_function(const AUX_FUNC ch_option, const AuxSwitchPos ch_flag) { // init channel options switch (ch_option) { @@ -130,7 +130,7 @@ void RC_Channel_Rover::do_aux_function_sailboat_motor_3pos(const AuxSwitchPos ch } } -bool RC_Channel_Rover::do_aux_function(const aux_func_t ch_option, const AuxSwitchPos ch_flag) +bool RC_Channel_Rover::do_aux_function(const AUX_FUNC ch_option, const AuxSwitchPos ch_flag) { switch (ch_option) { case AUX_FUNC::DO_NOTHING: diff --git a/Rover/RC_Channel.h b/Rover/RC_Channel.h index d25d714aa2..01c83da59b 100644 --- a/Rover/RC_Channel.h +++ b/Rover/RC_Channel.h @@ -11,8 +11,8 @@ public: protected: - void init_aux_function(aux_func_t ch_option, AuxSwitchPos) override; - bool do_aux_function(aux_func_t ch_option, AuxSwitchPos) override; + void init_aux_function(AUX_FUNC ch_option, AuxSwitchPos) override; + bool do_aux_function(AUX_FUNC ch_option, AuxSwitchPos) override; // called when the mode switch changes position: void mode_switch_changed(modeswitch_pos_t new_pos) override;