MAVlink forwarding #7670
Merged
MAVlink forwarding #7670
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
|
nice, i'll have a look |
|
I added changes that allow relaying when it's from the same systemID but a different component. This is required to relay statustext messages and have them show up in the GCS |
sanderux
previously approved these changes
Jul 23, 2017
|
Tested, works |
LorenzMeier
commented
Jul 23, 2017
src/modules/mavlink/mavlink_main.cpp
Outdated
| @@ -1999,6 +2006,9 @@ Mavlink::task_main(int argc, char *argv[]) | |||
| configure_stream("NAMED_VALUE_FLOAT", 1.0f); | |||
| configure_stream("VFR_HUD", 4.0f); | |||
| configure_stream("WIND_COV", 1.0f); | |||
| // Image captured runs at full rate independent of | |||
| // any limit | |||
| configure_stream("CAMERA_IMAGE_CAPTURED", 1.0f); | |||
There was a problem hiding this comment.
I need to remove this - this doesn't work without further changes.
LorenzMeier
commented
Jul 23, 2017
src/modules/mavlink/mavlink_main.cpp
Outdated
| //camera trigger is rate limited at the source, do not limit here | ||
| configure_stream("CAMERA_TRIGGER", 500.0f); | ||
| configure_stream("CAMERA_IMAGE_CAPTURED", 5.0f); | ||
| // Camera trigger runs at full rate independent of |
There was a problem hiding this comment.
I need to revert this - this doesn't work without further changes.
LorenzMeier
commented
Jul 23, 2017
src/modules/mavlink/mavlink_main.cpp
Outdated
| @@ -2084,8 +2097,12 @@ Mavlink::task_main(int argc, char *argv[]) | |||
| configure_stream("NAMED_VALUE_FLOAT", 50.0f); | |||
| configure_stream("VFR_HUD", 20.0f); | |||
| configure_stream("WIND_COV", 10.0f); | |||
| configure_stream("CAMERA_TRIGGER", 500.0f); | |||
| configure_stream("CAMERA_IMAGE_CAPTURED", 5.0f); | |||
| // Camera trigger runs at full rate independent of | |||
There was a problem hiding this comment.
I need to revert this - this doesn't work without further changes.
LorenzMeier
commented
Jul 23, 2017
|
@LorenzMeier can you revert your camera changes so we can get this in? |
|
Good to merge. I also verified memory footprint and made sure UAVCAN setups should still be fine. |
|
Jenkins test this please. |
sanderux
approved these changes
Jul 27, 2017
julianoes
added a commit
that referenced
this pull request
Jan 28, 2019
This removes the confusing ugly magic number of 233 introduced as part of #7670. Also, the convoluted if is cleaned up using 3 separate bools with some comments to explain what's going on. This should not change anything function-wise except that the flight controller could now potentially also use system ID 233 and not break forwarding.
julianoes
added a commit
that referenced
this pull request
Jan 29, 2019
This removes the confusing ugly magic number of 233 introduced as part of #7670. Also, the convoluted if is cleaned up using 3 separate bools with some comments to explain what's going on. This should not change anything function-wise except that the flight controller could now potentially also use system ID 233 and not break forwarding.
julianoes
added a commit
that referenced
this pull request
Jan 31, 2019
This removes the confusing ugly magic number of 233 introduced as part of #7670. Also, the convoluted if is cleaned up using 3 separate bools with some comments to explain what's going on. This should not change anything function-wise except that the flight controller could now potentially also use system ID 233 and not break forwarding.
dagar
pushed a commit
that referenced
this pull request
Feb 5, 2019
This removes the confusing ugly magic number of 233 introduced as part of #7670. Also, the convoluted if is cleaned up using 3 separate bools with some comments to explain what's going on. This should not change anything function-wise except that the flight controller could now potentially also use system ID 233 and not break forwarding.
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.
@sanderux This hopefully fixes the issues you were facing with forwarding. Could you cross-test and fix where required?