Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manual Control refactor #62

Merged
merged 21 commits into from
Feb 6, 2024
Merged

Manual Control refactor #62

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
73f3803
First pass at rework for manual control
DavidPaddy97 Jan 8, 2024
3431d7e
Added new sees topic to logging
DavidPaddy97 Jan 8, 2024
922ccc3
Reduced new sees topic logging to 10Hz
DavidPaddy97 Jan 8, 2024
4784f6f
Bug with previous mav/rc counts, trying a new approach
DavidPaddy97 Jan 8, 2024
4801058
Different approach for rc/mav counts again
DavidPaddy97 Jan 8, 2024
11aa480
New approach works, so removing old approaches. Also fixed bug with m…
DavidPaddy97 Jan 8, 2024
ea4404a
Moving RC Switch execution, now can toggle between sees (execute if v…
DavidPaddy97 Jan 8, 2024
6fe77b9
Adding comments
DavidPaddy97 Jan 9, 2024
6b64873
Added mavlink message for RC Flight Mode override, bit of cleanup too.
DavidPaddy97 Jan 9, 2024
a3512cf
Further cleanup
DavidPaddy97 Jan 9, 2024
ae8dfba
Removed unused builds from CI tests.
DavidPaddy97 Jan 9, 2024
0f6a80b
Removed comment
DavidPaddy97 Jan 9, 2024
ba76f5f
Excluded MacOS Sitl build test, error caused by latest empy version
DavidPaddy97 Jan 9, 2024
61bbd9a
Excluded another MacOS build test
DavidPaddy97 Jan 9, 2024
33bc0b0
Empty commit
DavidPaddy97 Jan 9, 2024
dcac650
Re-enabled the MacOS tests as the workflow is disabled at repo level
DavidPaddy97 Jan 9, 2024
f415f1a
Removing unused variables
DavidPaddy97 Jan 9, 2024
8020b3f
Decreased data types where unnecessary
DavidPaddy97 Feb 6, 2024
1b7aac0
Decreased data types again
DavidPaddy97 Feb 6, 2024
39f6f06
Adding comment
DavidPaddy97 Feb 6, 2024
9ed65b8
Merge branch 'v1.13.1_dev' into dp_manualcontrol_refactor
DavidPaddy97 Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Empty commit
  • Loading branch information
@DavidPaddy97
DavidPaddy97 committed Jan 9, 2024
commit 33bc0b05c21bbf9578ba884ab0f10b5e773cf4d8
2 changes: 1 addition & 1 deletion src/modules/manual_control/ManualControl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ void ManualControl::rc_switches_execute(bool switches_updated, const manual_cont
if (switches_updated) {
// Only use switches if current source is RC as well.
// ---Sees.ai--- Modified to check if COM_RC_MODE_IN parameter is set to enable Sees.ai control selector mods.
// If it is, then we allow RC switches (such as kill) to work at all times.
// If it is, we allow RC switches (such as kill) to work at all times.
if (_selector.setpoint().data_source == manual_control_setpoint_s::SOURCE_RC
|| _rc_in_mode == SEES_SOURCE_SELECTOR_ENABLED) {
if (_previous_switches_initialized) {
Expand Down
Loading