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

cFE Integration candidate: Caelum-rc4+dev39 #2245

Merged
merged 3 commits into from
Feb 16, 2023
Merged

Conversation

dzbaker
Copy link
Collaborator

@dzbaker dzbaker commented Feb 16, 2023

Checklist (Please check before submitting)

Describe the contribution

Testing performed
cFS Bundle Checks
cFE Checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu 20.04

Additional context
Add any other context about the contribution here.

Third party code
If included, identify any third party code and provide text file of license

Contributor Info - All information REQUIRED for consideration of pull request
@jphickey

jphickey and others added 3 commits February 16, 2023 09:47
Remove the "static" qualification from the TBL file def objects, it is
not needed, and works fine without any special sauce here.

This also adds extended documentation to all of the FILEDEF object
members to explain naming conventions and recommended practice.
Fix #2243, CFE_TBL_FILEDEF does not need static
dzbaker added a commit to nasa/cFS that referenced this pull request Feb 16, 2023
*Combines:*

cFE v7.0.0-rc4+dev250
osal v6.0.0-rc4+dev191

**Includes:**

*osal*
- nasa/cFE#2245

*osal*
- nasa/osal#1369

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Jose Martinez <pepepr08@users.noreply.github.com>
@dzbaker dzbaker mentioned this pull request Feb 16, 2023
2 tasks
@dzbaker dzbaker merged commit e35c3da into main Feb 16, 2023
dzbaker added a commit to nasa/cFS that referenced this pull request Feb 16, 2023
*Combines:*

cFE v7.0.0-rc4+dev250
osal v6.0.0-rc4+dev195

**Includes:**

*cFE*
- nasa/cFE#2245

*osal*
- nasa/osal#1369

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Jose Martinez <pepepr08@users.noreply.github.com>
@dmknutsen dmknutsen added this to the Equuleus milestone May 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants