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.

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

Integration Candidate 2020-03-25 #62

Merged
merged 6 commits into from
Apr 3, 2020
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Apr 1, 2020

Describe the contribution
Integration Candidate 2020-03-25,
incorporates changes to sample_app, cFE, and OSAL

Fix #28, #60, and #47,

Testing performed
PR #61
Bundle CI

Expected behavior changes
See related Integration Candidate PRs
nasa/osal#52
nasa/osal#401
nasa/cFE#579

Updates to Bundle CI:

  • Deploy documentation,
  • config warnings
  • removes permissive mode hack
  • Adds enforce of no doxygen warnings for osal and users guide

System(s) tested on
Bundle CI - Ubuntu:Bionic

Code contibutions
Jacob Hageman - NASA/GSFC
Gerardo E. Cruz-Ortiz - NASA/GSFC

Fix #28, Deploy documentation
Fix #60, config warnings except for the new ones
introduced by using the latest deployment version
Fix #47, removes permissive mode hack and updates README.md
Adds enforce of no doxygen warnings for osal and users guide
@astrogeco
Copy link
Contributor Author

astrogeco commented Apr 3, 2020

@skliper https://travis-ci.com/github/nasa/cFS/jobs/311547104
Can't tell why it's failing.

@jphickey
Copy link
Contributor

jphickey commented Apr 3, 2020

This is a merge issue - the global variable was renamed from Sample_AppData to SAMPLE_AppData to adhere to the capitalization patterns used in other units and the naming convention.

@astrogeco astrogeco merged commit 45eedc6 into master Apr 3, 2020
@skliper skliper added this to the 6.8.0 milestone Jun 1, 2020
chillfig pushed a commit to chillfig/cFS that referenced this pull request Mar 17, 2022
Entity IDs should be larger by default for real-world applicability, as this also
restricts what CFDP can receive, not just what it sends.  Note CFDP will only use
the number of bytes required to express the value, so values less than 256 will
still only use 1 byte, regardless of this config.  This just allows use of larger
values.
chillfig pushed a commit to chillfig/cFS that referenced this pull request Mar 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Automate a deployment of docs to GitHub pages
3 participants