Verbose RC Override #371
Open
Verbose RC Override #371
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
superjax
previously approved these changes
Feb 11, 2020
There was a problem hiding this comment.
Overall -- I'm really happy with this. In general, I like how the functions got shorter, and some of the real hairy logic got abstracted.
Thanks, also for writing the unit tests. I hope that it was a little bit easier this time, with the tests split out 😝
I can't remember if we were going to wait for the v1.0 release before merging this.
| RCOverrideReason stick_override_reason; | ||
| RCOverrideReason offboard_inactive_override_reason; | ||
| uint16_t override_mask; | ||
| } channel_override_t; |
There was a problem hiding this comment.
do we want to migrate to using C++ structs, instead of C structs?
src/command_manager.cpp
Outdated
| return override_this_channel; | ||
| if(!(muxes[MUX_F].onboard->active)) // The throttle has unique override behavior | ||
| rc_override |= OVERRIDE_OFFBOARD_T_INACTIVE; | ||
| if(RF_.params_.get_param_int(PARAM_RC_OVERRIDE_TAKE_MIN_THROTTLE)) |
There was a problem hiding this comment.
I know that the logic is relatively obvious, but I got lost. A comment would be nice.
also, let's put braces on this if statement
test/command_manager_test.cpp
Outdated
| rc_values[i] = 1500; | ||
| } | ||
| for (int i=4;i<8;i++) |
BillThePlatypus
force-pushed
the
verbose_rc_override
branch
from
84dd5b9 to
ad240fe
Compare
# Conflicts: # .astylerc # boards/airbourne/airbourne_board.cpp # boards/breezy/breezy_board.cpp # comms/mavlink/mavlink.cpp # comms/mavlink/mavlink.h # include/board.h # include/comm_manager.h # include/command_manager.h # include/controller.h # include/estimator.h # include/interface/comm_link.h # include/mixer.h # include/param.h # include/rc.h # include/rosflight.h # include/util.h # src/comm_manager.cpp # src/command_manager.cpp # src/controller.cpp # src/mixer.cpp # src/param.cpp # src/sensors.cpp # test/command_manager_test.cpp # test/estimator_test.cpp # test/test_board.cpp # test/test_board.h # test/turbotrig_test.cpp
# Conflicts: # boards/airbourne/airbourne_board.h # boards/breezy/breezy_board.h # boards/breezy/flash.h # include/board.h # include/command_manager.h # include/controller.h # include/estimator.h # include/interface/comm_link.h # include/mixer.h # include/param.h # include/rc.h # include/util.h # src/comm_manager.cpp # src/command_manager.cpp # src/controller.cpp # src/mixer.cpp # src/sensors.cpp # test/command_manager_test.cpp # test/common.h # test/estimator_test.cpp # test/turbotrig_test.cpp
|
This also seems like a lot of great work, we should visit revisit this at some point. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This changes the RC Override variable in the status message from a boolean to a bitfield, that indicates specifically why RC is overriding offboard controls. This also allows you to tell which channels are overridden. There are corresponding changes to rosflight_io that show this in the status messages.