Mission Computer and payload computer support #2053
Merged
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
podhrmic
changed the title
gautierhattenberger
requested changes
Apr 17, 2017
| @@ -142,7 +142,7 @@ | |||
|
|
|||
| // AUX1 | |||
| #if USE_ADC_2 | |||
| #define AD1_2_CHANNEL ADC_CHANNEL_IN2 | |||
| #define AD1_2_CHANNEL ADC_CHANNEL_IN3 | |||
There was a problem hiding this comment.
already fixed in master
There was a problem hiding this comment.
I think this came from git merge master - should I rebase or merge-rebase again?
| struct UtmCoor_f utm; | ||
| utm.zone = nav_utm_zone0; | ||
| utm_of_lla_f(&utm, &lla); | ||
| //nav_move_waypoint(wp_id, utm.east, utm.north, utm.alt); |
There was a problem hiding this comment.
please uncomment or remove
| struct CameraSnapshot cam_snapshot; | ||
| struct CopilotStatus copilot_status; | ||
|
|
||
| PPRZ_MUTEX(copilot_cam_snapshot_mtx); |
There was a problem hiding this comment.
Why are you using mutex ? There is no threads in this module.
There was a problem hiding this comment.
There might be threads in the future - so just added protection and good practice. I would rather have an unused mutex than forget to add it later.
Tested on Bebop and Bebop 2. v4.0.4 Min version set to 3.3 no motor swap issue "fix" unwanted behaviour.
|
Fixed - now there are no more conflicts |
|
@gautierhattenberger are we good to merge this? |
gautierhattenberger
approved these changes
Apr 19, 2017
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.
Adding functionality for forwarding messages from the mission and payload computers to GCS and vice-versa. Related to paparazzi/pprzlink#51
Also adds copilot module and adds minor changes to the way messages are parsed in the autopilot.
More details and the description of the system is here: https://wiki.paparazziuav.org/wiki/Mission_computer