Skip to content

Commit

Permalink
Merge branch 'fix-2447' of github.com:dzbaker/cFE into fix-2447
Browse files Browse the repository at this point in the history
  • Loading branch information
dzbaker committed Nov 28, 2023
2 parents 90a2027 + ea98f23 commit 987ba85
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion modules/config/fsw/src/cfe_config_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ void CFE_Config_SetupBasicBuildInfo(void)
CFE_Config_SetValue(CFE_CONFIGID_CORE_VERSION_BUILDNUM, CFE_BUILD_NUMBER);

CFE_Config_SetString(CFE_CONFIGID_CORE_VERSION_BASELINE, CFE_BUILD_BASELINE);
CFE_Config_GetVersionString(VersionString, "cFE", "DEVELOPMENT BUILD",
CFE_Config_GetVersionString(VersionString, 256, "cFE", "DEVELOPMENT BUILD",
CFE_SRC_VERSION, "Equuleus", "v6.7.0");
CFE_Config_SetString(CFE_CONFIGID_CORE_VERSION_DESCRIPTION, VersionString);

Expand Down
2 changes: 1 addition & 1 deletion modules/es/fsw/src/cfe_es_task.c
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ int32 CFE_ES_TaskInit(void)
/*
** Task startup event message.
*/
CFE_Config_GetVersionString(VersionString, "cFE", "DEVELOPMENT BUILD",
CFE_Config_GetVersionString(VersionString, 256, "cFE", "DEVELOPMENT BUILD",
CFE_SRC_VERSION, "Equuleus", "v6.7.0");
Status = CFE_EVS_SendEvent(CFE_ES_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, "cFE ES Initialized: %s",
VersionString);
Expand Down
4 changes: 2 additions & 2 deletions modules/evs/fsw/src/cfe_evs_task.c
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ int32 CFE_EVS_TaskInit(void)

/* Write the AppID to the global location, now that the rest of initialization is done */
CFE_EVS_Global.EVS_AppID = AppID;
CFE_Config_GetVersionString(VersionString, "cFE", "DEVELOPMENT BUILD",
CFE_Config_GetVersionString(VersionString, 256, "cFE", "DEVELOPMENT BUILD",
CFE_SRC_VERSION, "Equuleus", "v6.7.0");
EVS_SendEvent(CFE_EVS_STARTUP_EID, CFE_EVS_EventType_INFORMATION, "cFE EVS Initialized: %s", VersionString);

Expand All @@ -319,7 +319,7 @@ int32 CFE_EVS_TaskInit(void)
int32 CFE_EVS_NoopCmd(const CFE_EVS_NoopCmd_t *data)
{
char VersionString[256];
CFE_Config_GetVersionString(VersionString, "cFE", "DEVELOPMENT BUILD",
CFE_Config_GetVersionString(VersionString, 256, "cFE", "DEVELOPMENT BUILD",
CFE_SRC_VERSION, "Equuleus", "v6.7.0");
EVS_SendEvent(CFE_EVS_NOOP_EID, CFE_EVS_EventType_INFORMATION, "No-op Cmd Rcvd: %s", VersionString);
return CFE_SUCCESS;
Expand Down
4 changes: 2 additions & 2 deletions modules/sb/fsw/src/cfe_sb_task.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ int32 CFE_SB_AppInit(void)
return Status;
}

CFE_Config_GetVersionString(VersionString, "cFE", "DEVELOPMENT BUILD",
CFE_Config_GetVersionString(VersionString, 256, "cFE", "DEVELOPMENT BUILD",
CFE_SRC_VERSION, "Equuleus", "v6.7.0");
Status =
CFE_EVS_SendEvent(CFE_SB_INIT_EID, CFE_EVS_EventType_INFORMATION, "cFE SB Initialized: %s", VersionString);
Expand All @@ -289,7 +289,7 @@ int32 CFE_SB_AppInit(void)
int32 CFE_SB_NoopCmd(const CFE_SB_NoopCmd_t *data)
{
char VersionString[256];
CFE_Config_GetVersionString(VersionString, "cFE", "DEVELOPMENT BUILD",
CFE_Config_GetVersionString(VersionString, 256, "cFE", "DEVELOPMENT BUILD",
CFE_SRC_VERSION, "Equuleus", "v6.7.0");
CFE_EVS_SendEvent(CFE_SB_CMD0_RCVD_EID, CFE_EVS_EventType_INFORMATION, "No-op Cmd Rcvd: %s", VersionString);
CFE_SB_Global.HKTlmMsg.Payload.CommandCounter++;
Expand Down
2 changes: 1 addition & 1 deletion modules/tbl/fsw/src/cfe_tbl_task.c
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ int32 CFE_TBL_TaskInit(void)
/*
** Task startup event message
*/
CFE_Config_GetVersionString(VersionString, "cFE", "DEVELOPMENT BUILD",
CFE_Config_GetVersionString(VersionString, 256, "cFE", "DEVELOPMENT BUILD",
CFE_SRC_VERSION, "Equuleus", "v6.7.0");
Status = CFE_EVS_SendEvent(CFE_TBL_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, "cFE TBL Initialized: %s",
VersionString);
Expand Down
2 changes: 1 addition & 1 deletion modules/tbl/fsw/src/cfe_tbl_task_cmds.c
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ int32 CFE_TBL_NoopCmd(const CFE_TBL_NoopCmd_t *data)
{
char VersionString[256];
/* Acknowledge receipt of NOOP with Event Message */
CFE_Config_GetVersionString(VersionString, "cFE", "DEVELOPMENT BUILD",
CFE_Config_GetVersionString(VersionString, 256, "cFE", "DEVELOPMENT BUILD",
CFE_SRC_VERSION, "Equuleus", "v6.7.0");
CFE_EVS_SendEvent(CFE_TBL_NOOP_INF_EID, CFE_EVS_EventType_INFORMATION, "No-op Cmd Rcvd: %s", VersionString);

Expand Down
4 changes: 2 additions & 2 deletions modules/time/fsw/src/cfe_time_task.c
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ int32 CFE_TIME_TaskInit(void)
return Status;
}

CFE_Config_GetVersionString(VersionString, "cFE", "DEVELOPMENT BUILD",
CFE_Config_GetVersionString(VersionString, 256, "cFE", "DEVELOPMENT BUILD",
CFE_SRC_VERSION, "Equuleus", "v6.7.0");
Status = CFE_EVS_SendEvent(CFE_TIME_INIT_EID, CFE_EVS_EventType_INFORMATION, "cFE TIME Initialized: %s",
VersionString);
Expand Down Expand Up @@ -450,7 +450,7 @@ int32 CFE_TIME_NoopCmd(const CFE_TIME_NoopCmd_t *data)

CFE_TIME_Global.CommandCounter++;

CFE_Config_GetVersionString(VersionString, "cFE", "DEVELOPMENT BUILD",
CFE_Config_GetVersionString(VersionString, 256, "cFE", "DEVELOPMENT BUILD",
CFE_SRC_VERSION, "Equuleus", "v6.7.0");
CFE_EVS_SendEvent(CFE_TIME_NOOP_EID, CFE_EVS_EventType_INFORMATION, "No-op Cmd Rcvd: %s", VersionString);

Expand Down

0 comments on commit 987ba85

Please sign in to comment.