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

PSP Integration candidate: Caelum-rc4+dev45 #389

Merged
merged 4 commits into from
Apr 12, 2023
Merged

Conversation

dzbaker
Copy link
Contributor

@dzbaker dzbaker commented Apr 10, 2023

Checklist (Please check before submitting)

Describe the contribution

Testing performed
cFS Bundle Checks
PSP Checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu 22.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

Defines an "iodriver" interface with a simple module id + opcode +
argument interface, which can be extended as necessary for different
purposes.

Also adds a "linux_sysmon" module that implements this interface to
provide system monitoring capabilities.  This includes, but is not
limited to, the CPU utilization that HS needs.
Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CodeQL found more than 10 potential problems in the proposed changes. Check the Files changed tab for more details.

dzbaker added a commit to nasa/cFS that referenced this pull request Apr 10, 2023
*Combines:*

PSP v1.6.0-rc4+dev71
ci_lab v2.5.0-rc4+dev43
sample_app v1.3.0-rc4+dev39
sch_lab v2.5.0-rc4+dev49
to_lab v2.5.0-rc4+dev41

**Includes:**

*PSP*
- nasa/PSP#389

*ci_lab*
- nasa/ci_lab#136

*sample_app*
- nasa/sample_app#203

*sch_lab*
- nasa/sch_lab#136

*to_lab*
- nasa/to_lab#150

Co-authored by: Joseph Hickey <[email protected]>
@dzbaker dzbaker mentioned this pull request Apr 10, 2023
2 tasks
jphickey and others added 3 commits April 11, 2023 16:59
Update the doxygen documentation to correct warnings, and correct some
inconsistent symbol names.
Fix #385, adds generic driver interface and Linux sysmon module
@dzbaker dzbaker force-pushed the integration-candidate branch from ea1dcbf to d647a6d Compare April 12, 2023 13:00
dzbaker added a commit to nasa/cFS that referenced this pull request Apr 12, 2023
*Combines:*

PSP v1.6.0-rc4+dev71
ci_lab v2.5.0-rc4+dev43
sample_app v1.3.0-rc4+dev39
sch_lab v2.5.0-rc4+dev49
to_lab v2.5.0-rc4+dev41

**Includes:**

*PSP*
- nasa/PSP#389

*ci_lab*
- nasa/ci_lab#136

*sample_app*
- nasa/sample_app#203

*sch_lab*
- nasa/sch_lab#136

*to_lab*
- nasa/to_lab#150

Co-authored by: Joseph Hickey <[email protected]>
@dzbaker dzbaker merged commit 0765af2 into main Apr 12, 2023
dzbaker added a commit to nasa/cFS that referenced this pull request Apr 12, 2023
*Combines:*

PSP v1.6.0-rc4+dev71
ci_lab v2.5.0-rc4+dev43
sample_app v1.3.0-rc4+dev39
sch_lab v2.5.0-rc4+dev49
to_lab v2.5.0-rc4+dev41

**Includes:**

*PSP*
- nasa/PSP#389

*ci_lab*
- nasa/ci_lab#136

*sample_app*
- nasa/sample_app#203

*sch_lab*
- nasa/sch_lab#136

*to_lab*
- nasa/to_lab#150

Co-authored by: Joseph Hickey <[email protected]>
@dmknutsen dmknutsen added this to the Equuleus milestone Aug 23, 2023
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.

3 participants