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.

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

Fix #90, Rename SB Command Pipe to CmdPipe #91

Merged
merged 1 commit into from
Mar 16, 2023
Merged

Fix #90, Rename SB Command Pipe to CmdPipe #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions fsw/src/ds_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void DS_AppMain(void)
/*
** Wait for next Software Bus message...
*/
Result = CFE_SB_ReceiveBuffer(&BufPtr, DS_AppData.InputPipe, DS_SB_TIMEOUT);
Result = CFE_SB_ReceiveBuffer(&BufPtr, DS_AppData.CmdPipe, DS_SB_TIMEOUT);

/*
** Performance Log (start time counter)...
Expand Down Expand Up @@ -210,7 +210,7 @@ int32 DS_AppInitialize(void)
*/
if (Result == CFE_SUCCESS)
{
Result = CFE_SB_CreatePipe(&DS_AppData.InputPipe, DS_APP_PIPE_DEPTH, DS_APP_PIPE_NAME);
Result = CFE_SB_CreatePipe(&DS_AppData.CmdPipe, DS_APP_PIPE_DEPTH, DS_APP_PIPE_NAME);
if (Result != CFE_SUCCESS)
{
CFE_EVS_SendEvent(DS_INIT_ERR_EID, CFE_EVS_EventType_ERROR, "Unable to create input pipe, err = 0x%08X",
Expand All @@ -223,7 +223,7 @@ int32 DS_AppInitialize(void)
*/
if (Result == CFE_SUCCESS)
{
Result = CFE_SB_Subscribe(CFE_SB_ValueToMsgId(DS_SEND_HK_MID), DS_AppData.InputPipe);
Result = CFE_SB_Subscribe(CFE_SB_ValueToMsgId(DS_SEND_HK_MID), DS_AppData.CmdPipe);

if (Result != CFE_SUCCESS)
{
Expand All @@ -237,7 +237,7 @@ int32 DS_AppInitialize(void)
*/
if (Result == CFE_SUCCESS)
{
Result = CFE_SB_Subscribe(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_AppData.InputPipe);
Result = CFE_SB_Subscribe(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_AppData.CmdPipe);

if (Result != CFE_SUCCESS)
{
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/ds_app.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ typedef struct
*/
typedef struct
{
CFE_SB_PipeId_t InputPipe; /**< \brief Pipe Id for DS command pipe */
CFE_SB_PipeId_t CmdPipe; /**< \brief Pipe Id for DS command pipe */

CFE_ES_CDSHandle_t DataStoreHandle; /**< \brief Critical Data Store (CDS) handle */

Expand Down
4 changes: 2 additions & 2 deletions fsw/src/ds_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1431,7 +1431,7 @@ void DS_CmdAddMID(const CFE_SB_Buffer_t *BufPtr)
pFilterParms->Algorithm_O = 0;
}

CFE_SB_SubscribeEx(DS_AddMidCmd->MessageID, DS_AppData.InputPipe, CFE_SB_DEFAULT_QOS, DS_PER_PACKET_PIPE_LIMIT);
CFE_SB_SubscribeEx(DS_AddMidCmd->MessageID, DS_AppData.CmdPipe, CFE_SB_DEFAULT_QOS, DS_PER_PACKET_PIPE_LIMIT);
/*
** Notify cFE that we have modified the table data...
*/
Expand Down Expand Up @@ -1536,7 +1536,7 @@ void DS_CmdRemoveMID(const CFE_SB_Buffer_t *BufPtr)
pFilterParms->Algorithm_O = 0;
}

CFE_SB_Unsubscribe(DS_RemoveMidCmd->MessageID, DS_AppData.InputPipe);
CFE_SB_Unsubscribe(DS_RemoveMidCmd->MessageID, DS_AppData.CmdPipe);

/*
** Notify cFE that we have modified the table data...
Expand Down
4 changes: 2 additions & 2 deletions fsw/src/ds_table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ void DS_TableSubscribe(void)
if (CFE_SB_IsValidMsgId(MessageID) && (CFE_SB_MsgIdToValue(MessageID) != DS_CMD_MID) &&
(CFE_SB_MsgIdToValue(MessageID) != DS_SEND_HK_MID))
{
CFE_SB_SubscribeEx(MessageID, DS_AppData.InputPipe, CFE_SB_DEFAULT_QOS, DS_PER_PACKET_PIPE_LIMIT);
CFE_SB_SubscribeEx(MessageID, DS_AppData.CmdPipe, CFE_SB_DEFAULT_QOS, DS_PER_PACKET_PIPE_LIMIT);
}
}
}
Expand Down Expand Up @@ -858,7 +858,7 @@ void DS_TableUnsubscribe(void)
if (CFE_SB_IsValidMsgId(MessageID) && (CFE_SB_MsgIdToValue(MessageID) != DS_CMD_MID) &&
(CFE_SB_MsgIdToValue(MessageID) != DS_SEND_HK_MID))
{
CFE_SB_Unsubscribe(MessageID, DS_AppData.InputPipe);
CFE_SB_Unsubscribe(MessageID, DS_AppData.CmdPipe);
}
}
}
Expand Down