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

ci_lab Integration Candidate: 2020-12-08 #65

Merged
merged 5 commits into from
Dec 9, 2020
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Dec 1, 2020

Describe the contribution

Fix #62, Apply message alignment pattern

Testing performed
See https://github.com/nasa/cFS/pull/160/checks

Expected behavior changes
PR #63 - Aligns messages according to changes in cFE nasa/cFE#1009. Uses the "raw" message cmd/tlm types in definition

System(s) tested on
Ubuntu 18.04

Additional context
Part of nasa/cFS#160

Third party code
None

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

skliper and others added 3 commits November 30, 2020 11:04
- Use CFE_SB_Buffer_t for receiving and casting to command types
- Use CFE_MSG_CommandHeader_t and CFE_MSG_TelemetryHeader_t in
  command and telemetry type definitions
- Use CFE_SB_TransmitMsg to copy the command and telemetry
  into a CFE_SB_Buffer_t and send it where needed
- Avoids need to create send buffers within the app (or union
  the packet types with CFE_SB_Buffer_t)
- Eliminates references to CFE_SB_CmdHdr_t and CFE_SB_TlmHdr_t
  that formerly enforced alignment since these had potential
  to change the actual packet sizes
- No need to cast to CFE_MSG_Message_t anywhere since it's
  available in the CFE_SB_Buffer_t union
 - Replaced CFE_SB_RcvMsg with CFE_SB_ReceiveBuffer
 - Replaced CFE_MSG_Size_t with size_t
Fix #62, Apply message alignment pattern
@astrogeco
Copy link
Contributor Author

astrogeco commented Dec 1, 2020

@skliper having some trouble after merging #63
EDIT: haven't merged nasa/cFE#1015 yet

See https://github.com/astrogeco/cFS/runs/1481379928?check_suite_focus=true

In file included from /home/runner/work/cFS/cFS/apps/ci_lab/fsw/src/ci_lab_app.c:32:0:
/home/runner/work/cFS/cFS/apps/ci_lab/fsw/src/ci_lab_app.h:66:34: error: unknown type name ‘CFE_SB_Buffer_t’; did you mean ‘CFE_SB_TlmHdr_t’?
 void CI_LAB_ProcessCommandPacket(CFE_SB_Buffer_t *SBBufPtr);
                                  ^~~~~~~~~~~~~~~
                                  CFE_SB_TlmHdr_t

@skliper
Copy link
Contributor

skliper commented Dec 1, 2020

@astrogeco - yup, won't work until the fix for nasa/cFE#1009 (nasa/cFE#1015) is in.

@astrogeco astrogeco changed the title Integration Candidate: 2020-11-24 ci_lab Integration Candidate: 2020-11-24 Dec 1, 2020
@astrogeco astrogeco changed the title ci_lab Integration Candidate: 2020-11-24 ci_lab Integration Candidate: 2020-12-09 Dec 1, 2020
@astrogeco astrogeco marked this pull request as ready for review December 2, 2020 14:46
@astrogeco
Copy link
Contributor Author

@skliper got an error when running cFS
See https://github.com/nasa/cFS/actions/runs/408945590. You can see the startup file by scrolling to the bottom in the "artifacts" section. Is this a setup issue on the testing side?

1980-012-14:03:48.50227 POWERON RESET called from CFE_ES_ResetCFE (Commanded).
CFE_PSP: Exiting cFE with POWERON Reset status.
EVS Port1 66/1/CFE_SB 17: Msg Limit Err,MsgId 0x1806,pipe ES_CMD_PIPE,sender CI_LAB_APP
CFE_PSP: Critical Data Store Shared memory segment removed
Reset Area Shared memory segment removed
EVS Port1 66/1/CFE_SB 17: Msg Limit Err,MsgId 0x1806,pipe ES_CMD_PIPE,sender CI_LAB_APP
User Reserved Area Shared memory segment removed
EVS Port1 66/1/CFE_SB 17: Msg Limit Err,MsgId 0x1806,pipe ES_CMD_PIPE,sender CI_LAB_APP
EVS Port1 66/1/CFE_SB 17: Msg Limit Err,MsgId 0x1806,pipe ES_CMD_PIPE,sender CI_LAB_APP

@astrogeco astrogeco changed the title ci_lab Integration Candidate: 2020-12-09 ci_lab Integration Candidate: 2020-12-08 Dec 8, 2020
@skliper
Copy link
Contributor

skliper commented Dec 8, 2020

@astrogeco I was able to recreate on a dev vm, so not specific to your setup.

@skliper
Copy link
Contributor

skliper commented Dec 9, 2020

@astrogeco pushed hotfix. I shouldn't have removed the cast on the size comparison to catch negative return status.

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.

Update for suggested alignment enforcement pattern (nasa/cFE#1009)
2 participants