Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-30 04:06:33 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

ManualControlSelector: unify validity conditions into one place

Browse Source
This commit is contained in:
Matthias Grob
2025-10-01 16:40:43 +02:00
committed by Tobias Büchli
parent 365525269e
commit 661b0655dc
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/manual_control/ManualControlSelector.cpp
+4 -11
View File
@@ -46,15 +46,8 @@ void ManualControlSelector::updateWithNewInputSample(uint64_t now, const manual_
// First check if the chosen input got invalid, so it can get replaced // First check if the chosen input got invalid, so it can get replaced
updateValidityOfChosenInput(now); updateValidityOfChosenInput(now);
const bool update_existing_input = _setpoint.valid && (input.data_source == _setpoint.data_source); // Update with input sample if it's valid and should be chosen according to COM_RC_IN_MODE
const bool start_using_new_input = !_setpoint.valid; if (isInputValid(input, now)) {
const bool is_priority_mode = (_rc_in_mode == RcInMode::PriorityRcThenMavlinkAscending
|| _rc_in_mode == RcInMode::PriorityMavlinkAscendingThenRc
|| _rc_in_mode == RcInMode::PriorityRcThenMavlinkDescending
|| _rc_in_mode == RcInMode::PriorityMavlinkDescendingThenRc);
// Switch to new input if it's valid and we don't already have a valid one
if (isInputValid(input, now) && (update_existing_input || start_using_new_input || is_priority_mode)) {
_setpoint = input; _setpoint = input;
_setpoint.valid = true; _setpoint.valid = true;
_setpoint.timestamp = now; // timestamp_sample is preserved _setpoint.timestamp = now; // timestamp_sample is preserved
@@ -81,11 +74,11 @@ bool ManualControlSelector::isInputValid(const manual_control_setpoint_s &input,
break; break;
case RcInMode::MavLinkOnly: case RcInMode::MavLinkOnly:
match = isMavlink(input.data_source); match = isMavlink(input.data_source) && ((input.data_source == _setpoint.data_source) || !_setpoint.valid);
break; break;
case RcInMode::RcOrMavlinkWithFallback: case RcInMode::RcOrMavlinkWithFallback:
match = true; match = (input.data_source == _setpoint.data_source) || !_setpoint.valid;
break; break;
case RcInMode::RcOrMavlinkKeepFirst: case RcInMode::RcOrMavlinkKeepFirst: