[nasa/nos3#445] - Move yamcs component definitions #480
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
rjbrown2
requested review from
jlucas9,
msuder,
kevincbruce,
dacarter22,
zlynch2 and
Isgaroth-the-Green
rjbrown2
changed the title
rjbrown2
changed the title
kevincbruce
approved these changes
Jan 24, 2025
jlucas9
approved these changes
Jan 24, 2025
|
Looks like some of your updates to submodules broke that merge request here. Can you merge dev or any changes blocking the merge back into the generic_adcs modules (or others that may have broken as well) |
|
@rjbrown2 Can look, though I don't believe I touched ADCS. I touched EPS and CSS, and a couple of top level files (port number fixes). |
Ahh, sorry to blame you. I thought you had to go through and fix a couple of CMakes. Might just need Dev pulled into the module. If you didn't do it I'll look into it. |
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.
No major changes to running. This includes a fix to EPS that was causing commanding to break.
Major changes here are just to move the XTCE files into their components instead of a huge directory in YAMCS. Will help to keep the mdb files up to date, and easier to find.
Currently seem to be some merge conflicts to work out first.