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

Fix #184, Update tlm for ES Blockstats/memstats and TBL HK #185

Merged
merged 1 commit into from
Jul 28, 2021

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Jul 26, 2021

Describe the contribution
Fixes #184, updating the tlm definition files for ES blockstats/memstats and TBL HK

Testing performed
Observed the memory pool handle in TBL HK (now correct), and sent the ES request for memory pool info using that handle and observed correct behavior. For the handle used in the current run the command was:
./cmdUtil --endian=LE --pktid=0x1806 -C22 --string=20:notused -o0x140002

Expected behavior changes
Correct display of the respective packets.

System(s) tested on

  • Hardware: Intel I5
  • OS: Ubuntu 18.04
  • Versions: Bundle main + this commit

Additional context
nasa/cFE#1708

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman - NASA/GSFC

@skliper skliper added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Jul 26, 2021
@skliper skliper added this to the 3.0.0 milestone Jul 26, 2021
@astrogeco astrogeco removed the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Jul 28, 2021
@astrogeco
Copy link
Contributor

astrogeco commented Jul 28, 2021

CCB:2021-07-28 APPROVED

  • Why is one of them in hex? Handles are kind of like addresses

@astrogeco astrogeco added the CCB:Approved Indicates approval by CCB label Jul 28, 2021
@astrogeco astrogeco changed the base branch from main to integration-candidate July 28, 2021 16:52
@astrogeco astrogeco merged commit 035f7a7 into nasa:integration-candidate Jul 28, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Jul 28, 2021
nasa/cFS-GroundSystem#185, Update tlm for ES Blockstats/memstats and TBL HK
astrogeco added a commit to nasa/cFS that referenced this pull request Jul 29, 2021
Combines:

nasa/cFE#1701, v6.8.0-rc1+dev789
nasa/osal#1116, v5.1.0-rc1+dev578
nasa/cFS-GroundSystem#192, v2.2.0-rc1+dev58

Includes:

**cFE**

nasa/cFE#1699, correct return code check
nasa/cFE#1700, documentation for FS APIs that return OSAL codes
nasa/cFE#1695, Adding coverage tests for cfe_es_apps.c
nasa/cFE#1673, Add File Utility Functional Tests.
nasa/cFE#1711, Add custom epoch support to TIME UT
nasa/cFE#1720, Requirements update for Caelum
nasa/cFE#1721, Add null check to CFE_ES_TaskID_ToIndex.
nasa/cFE#1719, scrub command documentation
nasa/cFE#1715, Add time arithmetic functional tests
nasa/cFE#1704, update docs for CFE_FS_BackgroundFileDumpRequest
nasa/cFE#1706, correct return code mismatches

**osal**

nasa/osal#1114, Add unit test branch coverage

**cFS-GroundSystem**

nasa/cFS-GroundSystem#185, Update tlm for ES Blockstats/memstats and TBL HK
nasa/cFS-GroundSystem#188, * might be referenced before assignment

Co-authored-by: Jacob Hageman <skliper@users.noreply.github.com>
Co-authored-by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored-by: Alex Campbell <zanzaben@users.noreply.github.com>
Co-authored-by: Jose F Martinez Pedraza <pepepr08@users.noreply.github.com>
Co-authored-by: Niall Mullane <nmullane@users.noreply.github.com>
Co-authored-by: Paul <pavll@users.noreply.github.com>
@skliper skliper deleted the fix184-tlm_mempool branch October 22, 2021 19:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates approval by CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ES and TBL packets defined incorrectly
2 participants