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

RC_Channel: rework duplicate-rc-options check to use a Bitmask

Browse Source 
just for the memory saving.

Co-authored-by: muramura <ma2maru@gmail.com>
This commit is contained in:
Peter Barker 2024-07-25 15:55:54 +10:00 committed by Andrew Tridgell
parent b358c503fb
commit 6f5ea5a5e9
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/RC_Channel/RC_Channel.cpp
View File

@ -1859,7 +1859,7 @@ RC_Channel *RC_Channels::find_channel_for_option(const RC_Channel::AUX_FUNC opti
// duplicate_options_exist - returns true if any options are duplicated // duplicate_options_exist - returns true if any options are duplicated
bool RC_Channels::duplicate_options_exist() bool RC_Channels::duplicate_options_exist()
{ {
uint8_t auxsw_option_counts[512] = {}; Bitmask<(uint16_t)RC_Channel::AUX_FUNC::AUX_FUNCTION_MAX> used_auxsw_options;
for (uint8_t i=0; i<NUM_RC_CHANNELS; i++) { for (uint8_t i=0; i<NUM_RC_CHANNELS; i++) {
const RC_Channel *c = channel(i); const RC_Channel *c = channel(i);
if (c == nullptr) { if (c == nullptr) {
@ -1867,19 +1867,16 @@ bool RC_Channels::duplicate_options_exist()
continue; continue;
} }
const uint16_t option = c->option.get(); const uint16_t option = c->option.get();
if (option >= sizeof(auxsw_option_counts)) { if (option == (uint16_t)RC_Channel::AUX_FUNC::DO_NOTHING) {
continue; continue;
} }
auxsw_option_counts[option]++; if (option >= used_auxsw_options.size()) {
}
for (uint16_t i=0; i<sizeof(auxsw_option_counts); i++) {
if (i == 0) { // MAGIC VALUE! This is AUXSW_DO_NOTHING
continue; continue;
} }
if (auxsw_option_counts[i] > 1) { if (used_auxsw_options.get(option)) {
return true; return true;
} }
used_auxsw_options.set(option);
} }
return false; return false;
} }