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.

Sign up for GitHub

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

Jump to bottom

cFE Integration candidate: Caelum-rc4+dev66 #2480

Merged

dzbaker merged 9 commits into main from integration-candidate

Dec 12, 2023

Collaborator

dzbaker commented Dec 12, 2023 •

edited

Loading

Checklist (Please check before submitting)

I reviewed the Contributing Guide.
I signed and emailed the appropriate Contributor License Agreement to GSFC-SoftwareRelease@mail.nasa.gov and copied cfs-program@lists.nasa.gov.

Describe the contribution

PR Fix #2057, Update docs and UT to use CFE_MSG_PTR #2472. Addresses Issue Update app dev guide and unit tests to use CFE_MSG_PTR instead of &(x).Msg #2057
PR Fix #2410, document ES Perf enums #2411. Addresses Issue Values for TriggerMode provided to CFE_ES_StartPerfCmd are not documented #2410
PR Fix #2473, 2475, document and use topicid numbers for cfe #2474. Addresses Issue Formalize and document msg number / topic id concept #2473, 2475

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
@thnkslprpt
@jphickey
@irowebbn

irowebbn and others added 9 commits

December 5, 2023 12:10


          Fix #2410, document ES Perf enums

1733ffe


          Fix #2057, Update docs and UT to use CFE_MSG_PTR

23c7991


          Fix #2473, document and use topicid numbers for cfe

f3cdfbe

A topic ID is the same concept as was previously referred to as a
portable message number.  This just formalizes it, gives it a name,
and adds some macros for easier customization of the behavior.


          Fix #2475, rename 1HZ to ONEHZ in symbols

1d6a761

This avoids having an identifier that starts with a digit
in the case that the CFE_TIME_ prefix is not needed/used.


          HotFix #2411, move perf enum definition

e56d5e0

The API documentation should not refer to internal headers, only
public headers.  The fact that the message payload was based on
this enum meant that the enum definition is in the wrong place.


          Merge pull request #2472 from thnkslprpt:fix-2057-update-docs-and-UT-…

68da2a7

…with-CFE_MSG_PTR

Fix #2057, Update docs and UT to use CFE_MSG_PTR


          Merge pull request #2411 from irowebbn:2410-doc-triggermode

7ae394d

Fix #2410, document ES Perf enums


          Merge pull request #2474 from jphickey:fix-2473-topicid

780e377

Fix #2473, 2475, document and use topicid numbers for cfe


          Updating documentation and version numbers for v7.0.0-rc4+dev434

ac79261

github-advanced-security bot found potential problems

View reviewed changes

modules/time/ut-coverage/time_UT.c

@@ @@ -49,14 +49,14 @@ @@
                                                 "%s: Application Init Failed,RC=0x%08X\n",
                                                 "%s: Failed invalid arguments\n"};
-              static const UT_TaskPipeDispatchId_t UT_TPID_CFE_TIME_SEND_HK  = {.MsgId =
+              static const UT_TaskPipeDispatchId_t UT_TPID_CFE_TIME_SEND_HK   = {.MsgId =

Check notice

Code scanning / CodeQL-coding-standard

Variable scope too large Note

The variable UT_TPID_CFE_TIME_SEND_HK is only accessed in

Test_PipeCmds

and should be scoped accordingly.

modules/time/ut-coverage/time_UT.c

                                                                                    CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_SEND_HK_MID)};
-              static const UT_TaskPipeDispatchId_t UT_TPID_CFE_TIME_TONE_CMD = {.MsgId =
+              static const UT_TaskPipeDispatchId_t UT_TPID_CFE_TIME_TONE_CMD  = {.MsgId =

Check notice

Code scanning / CodeQL-coding-standard

Variable scope too large Note

The variable UT_TPID_CFE_TIME_TONE_CMD is only accessed in

Test_PipeCmds

and should be scoped accordingly.

modules/time/ut-coverage/time_UT.c

                                                                                     CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_TONE_CMD_MID)};
-              static const UT_TaskPipeDispatchId_t UT_TPID_CFE_TIME_DATA_CMD = {.MsgId =
+              static const UT_TaskPipeDispatchId_t UT_TPID_CFE_TIME_DATA_CMD  = {.MsgId =

Check notice

Code scanning / CodeQL-coding-standard

Variable scope too large Note

The variable UT_TPID_CFE_TIME_DATA_CMD is only accessed in

Test_PipeCmds

and should be scoped accordingly.

modules/time/ut-coverage/time_UT.c

-                  .MsgId = CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_CMD_MID), .CommandCode = CFE_TIME_ADD_1HZ_ADJUSTMENT_CC};
-              static const UT_TaskPipeDispatchId_t UT_TPID_CFE_TIME_CMD_SUB_1HZ_ADJUSTMENT_CC = {
-                  .MsgId = CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_CMD_MID), .CommandCode = CFE_TIME_SUB_1HZ_ADJUSTMENT_CC};
+              static const UT_TaskPipeDispatchId_t UT_TPID_CFE_TIME_CMD_ADD_ONEHZ_ADJUSTMENT_CC = {

Check notice

Code scanning / CodeQL-coding-standard

Variable scope too large Note

The variable UT_TPID_CFE_TIME_CMD_ADD_ONEHZ_ADJUSTMENT_CC is only accessed in

Test_PipeCmds

and should be scoped accordingly.

modules/time/ut-coverage/time_UT.c

-                  .MsgId = CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_CMD_MID), .CommandCode = CFE_TIME_SUB_1HZ_ADJUSTMENT_CC};
+              static const UT_TaskPipeDispatchId_t UT_TPID_CFE_TIME_CMD_ADD_ONEHZ_ADJUSTMENT_CC = {
+                  .MsgId = CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_CMD_MID), .CommandCode = CFE_TIME_ADD_ONEHZ_ADJUSTMENT_CC};
+              static const UT_TaskPipeDispatchId_t UT_TPID_CFE_TIME_CMD_SUB_ONEHZ_ADJUSTMENT_CC = {

Check notice

Code scanning / CodeQL-coding-standard

Variable scope too large Note

The variable UT_TPID_CFE_TIME_CMD_SUB_ONEHZ_ADJUSTMENT_CC is only accessed in

Test_PipeCmds

and should be scoped accordingly.

modules/time/ut-coverage/time_UT.c

                                                                                     CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_DATA_CMD_MID)};
-              static const UT_TaskPipeDispatchId_t UT_TPID_CFE_TIME_1HZ_CMD  = {.MsgId =
-                                                                                   CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_1HZ_CMD_MID)};
+              static const UT_TaskPipeDispatchId_t UT_TPID_CFE_TIME_ONEHZ_CMD = {.MsgId =

Check notice

Code scanning / CodeQL-coding-standard

Variable scope too large Note

The variable UT_TPID_CFE_TIME_ONEHZ_CMD is only accessed in

Test_PipeCmds

and should be scoped accordingly.

dzbaker merged commit 70458a2 into main

40 of 41 checks passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet