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 #37, Opaque CFE_SB_MsgId_t values #38

Merged
merged 1 commit into from
May 8, 2020
+10 −10
Merged

Fix #37, Opaque CFE_SB_MsgId_t values #38

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
2 changes: 1 addition & 1 deletion fsw/src/sch_lab_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ int32 SCH_LAB_AppInit(void)
if (ConfigEntry->PacketRate != 0)
{
CFE_SB_InitMsg(&LocalStateEntry->MsgBuf.MsgHdr,
CFE_SB_ValueToMsgId(ConfigEntry->MessageID),
ConfigEntry->MessageID,
sizeof(LocalStateEntry->MsgBuf), true);
LocalStateEntry->PacketRate = ConfigEntry->PacketRate;
}
Expand Down
18 changes: 9 additions & 9 deletions fsw/src/sch_lab_table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#include "cfe_tbl_filedef.h" /* Required to obtain the CFE_TBL_FILEDEF macro definition */
#include "sch_lab_sched_tab.h"

#include "cfe_sb.h" /* Required to use the CFE_SB_MSGID_WRAP_VALUE macro */

/*
** SCH Lab schedule table
Expand All @@ -37,14 +37,14 @@ SCH_LAB_ScheduleTable_t SCH_TBL_Structure =
{
.Config =
{
{ CFE_ES_SEND_HK_MID, 4 },
{ CFE_EVS_SEND_HK_MID, 4 },
{ CFE_TIME_SEND_HK_MID, 4 },
{ CFE_SB_SEND_HK_MID, 4 },
{ CFE_TBL_SEND_HK_MID, 4 },
{ CI_LAB_SEND_HK_MID, 4 },
{ TO_LAB_SEND_HK_MID, 4 },
{ SAMPLE_APP_SEND_HK_MID, 4 },
{ CFE_SB_MSGID_WRAP_VALUE(CFE_ES_SEND_HK_MID), 4 },
{ CFE_SB_MSGID_WRAP_VALUE(CFE_EVS_SEND_HK_MID), 4 },
{ CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_SEND_HK_MID), 4 },
{ CFE_SB_MSGID_WRAP_VALUE(CFE_SB_SEND_HK_MID), 4 },
{ CFE_SB_MSGID_WRAP_VALUE(CFE_TBL_SEND_HK_MID), 4 },
{ CFE_SB_MSGID_WRAP_VALUE(CI_LAB_SEND_HK_MID), 4 },
{ CFE_SB_MSGID_WRAP_VALUE(TO_LAB_SEND_HK_MID), 4 },
{ CFE_SB_MSGID_WRAP_VALUE(SAMPLE_APP_SEND_HK_MID), 4 },
#if 0
{ SC_SEND_HK_MID, 4, 0 },
{ SC_1HZ_WAKEUP_MID, 1, 0 }, /* Example of a 1hz packet */
Expand Down