diff --git a/README.md b/README.md index 9caafdb..765bb71 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,11 @@ To change the list of packets that sch_lab sends out, edit the schedule table lo ## Version History +### Development Build: 2.4.0-rc1+dev9 + +- Update to use MSG module. Replaces deprecated SB APIs with MSG +- See + ### Development Build: 2.4.0-rc1+dev6 - Adds header guard (the other warning on the ticket was already resolved) diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c index bf5e25e..adf005d 100644 --- a/fsw/src/sch_lab_app.c +++ b/fsw/src/sch_lab_app.c @@ -49,17 +49,11 @@ /* ** Global Structure */ -typedef union -{ - CFE_SB_Msg_t MsgHdr; - CFE_SB_CmdHdr_t CommandHeader; -} SCH_LAB_MessageBuffer_t; - typedef struct { - SCH_LAB_MessageBuffer_t MsgBuf; - uint32 PacketRate; - uint32 Counter; + CFE_SB_CmdHdr_t CmdBuf; + uint32 PacketRate; + uint32 Counter; } SCH_LAB_StateEntry_t; typedef struct @@ -67,8 +61,8 @@ typedef struct SCH_LAB_StateEntry_t State[SCH_LAB_MAX_SCHEDULE_ENTRIES]; CFE_TBL_Handle_t TblHandle; - CFE_SB_Msg_t * CmdPipePktPtr; - CFE_SB_PipeId_t CmdPipe; + CFE_MSG_Message_t *CmdPipePktPtr; + CFE_SB_PipeId_t CmdPipe; } SCH_LAB_GlobalData_t; @@ -128,7 +122,7 @@ void SCH_Lab_AppMain(void) if (LocalStateEntry->Counter >= LocalStateEntry->PacketRate) { LocalStateEntry->Counter = 0; - CFE_SB_SendMsg(&LocalStateEntry->MsgBuf.MsgHdr); + CFE_SB_SendMsg(&LocalStateEntry->CmdBuf.BaseMsg); } } ++LocalStateEntry; @@ -204,8 +198,7 @@ int32 SCH_LAB_AppInit(void) { if (ConfigEntry->PacketRate != 0) { - CFE_SB_InitMsg(&LocalStateEntry->MsgBuf.MsgHdr, ConfigEntry->MessageID, sizeof(LocalStateEntry->MsgBuf), - true); + CFE_MSG_Init(&LocalStateEntry->CmdBuf.BaseMsg, ConfigEntry->MessageID, sizeof(LocalStateEntry->CmdBuf)); LocalStateEntry->PacketRate = ConfigEntry->PacketRate; } ++ConfigEntry; diff --git a/fsw/src/sch_lab_version.h b/fsw/src/sch_lab_version.h index 2742f7c..42e2ef0 100644 --- a/fsw/src/sch_lab_version.h +++ b/fsw/src/sch_lab_version.h @@ -30,7 +30,7 @@ */ /* Development Build Macro Definitions */ -#define SCH_LAB_BUILD_NUMBER 6 /*!< Development Build: Number of commits since baseline */ +#define SCH_LAB_BUILD_NUMBER 9 /*!< Development Build: Number of commits since baseline */ #define SCH_LAB_BUILD_BASELINE "v2.4.0-rc1" /*!< Development Build: git tag that is the base for the current development */ /* Version Macro Definitions */