aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RC_Channel: avoid using out-of-range aux switch values

Browse Source 
We already use these ranges for the mode switch
This commit is contained in:
Peter Barker 2019-01-08 13:19:34 +11:00 committed by Randy Mackay
parent e93cff6e44
commit bb0a4f3c78
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libraries/RC_Channel/RC_Channel.cpp
View File

@ -463,7 +463,10 @@ void RC_Channel::read_aux()
// here e.g. RCMAP_ROLL etc once they become options // here e.g. RCMAP_ROLL etc once they become options
return; return;
} }
const aux_switch_pos_t new_position = read_3pos_switch(); aux_switch_pos_t new_position;
if (!read_3pos_switch(new_position)) {
return;
}
const aux_switch_pos_t old_position = old_switch_position(); const aux_switch_pos_t old_position = old_switch_position();
if (new_position == old_position) { if (new_position == old_position) {
debounce.count = 0; debounce.count = 0;
@ -684,18 +687,28 @@ void RC_Channel::do_aux_function(const aux_func_t ch_option, const aux_switch_po
void RC_Channel::init_aux() void RC_Channel::init_aux()
{ {
const aux_switch_pos_t position = read_3pos_switch(); aux_switch_pos_t position;
set_old_switch_position(position); if (!read_3pos_switch(position)) {
position = aux_switch_pos_t::LOW;
}
init_aux_function((aux_func_t)option.get(), position); init_aux_function((aux_func_t)option.get(), position);
} }
// read_3pos_switch // read_3pos_switch
RC_Channel::aux_switch_pos_t RC_Channel::read_3pos_switch() const bool RC_Channel::read_3pos_switch(RC_Channel::aux_switch_pos_t &ret) const
{ {
const uint16_t in = get_radio_in(); const uint16_t in = get_radio_in();
if (in < AUX_PWM_TRIGGER_LOW) return LOW; // switch is in low position if (in <= 900 or in >= 2200) {
if (in > AUX_PWM_TRIGGER_HIGH) return HIGH; // switch is in high position return false;
return MIDDLE; // switch is in middle position }
if (in < AUX_PWM_TRIGGER_LOW) {
ret = LOW;
} else if (in > AUX_PWM_TRIGGER_HIGH) {
ret = HIGH;
} else {
ret = MIDDLE;
}
return true;
} }
RC_Channel *RC_Channels::find_channel_for_option(const RC_Channel::aux_func_t option) RC_Channel *RC_Channels::find_channel_for_option(const RC_Channel::aux_func_t option)

2
libraries/RC_Channel/RC_Channel.h
View File

@ -238,7 +238,7 @@ private:
static const uint16_t AUX_PWM_TRIGGER_HIGH = 1800; static const uint16_t AUX_PWM_TRIGGER_HIGH = 1800;
// pwm value below which the option will be disabled: // pwm value below which the option will be disabled:
static const uint16_t AUX_PWM_TRIGGER_LOW = 1200; static const uint16_t AUX_PWM_TRIGGER_LOW = 1200;
aux_switch_pos_t read_3pos_switch() const; bool read_3pos_switch(aux_switch_pos_t &ret) const WARN_IF_UNUSED;
//Documentation of Aux Switch Flags: //Documentation of Aux Switch Flags:
// 0 is low or false, 1 is center or true, 2 is high // 0 is low or false, 1 is center or true, 2 is high