From 1bd3dd3cc7e841a56bc151bb755aee35f6f6f37c Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Fri, 10 Sep 2021 17:07:34 -0400 Subject: [PATCH 1/2] Fix #90, apply CFE_SB_ValueToMsgId where required Whenever an integer value is used as a CFE_SB_MsgId_t, it should go through the explicit conversion using the supplied inline function. --- fsw/src/sch_lab_app.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c index fb56a3e..2539267 100644 --- a/fsw/src/sch_lab_app.c +++ b/fsw/src/sch_lab_app.c @@ -219,7 +219,7 @@ int32 SCH_LAB_AppInit(void) OS_printf("SCH Error creating pipe!\n"); } - Status = CFE_SB_Subscribe(CFE_TIME_1HZ_CMD_MID, SCH_LAB_Global.CmdPipe); + Status = CFE_SB_Subscribe(CFE_SB_ValueToMsgId(CFE_TIME_1HZ_CMD_MID), SCH_LAB_Global.CmdPipe); if (Status != CFE_SUCCESS) { OS_printf("SCH Error subscribing to 1hz!\n"); From d4d43f0afda616f57ea74bd2feca8bbd59d6adc1 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Tue, 21 Sep 2021 21:57:30 -0400 Subject: [PATCH 2/2] IC:2021-09-21, v2.4.0-rc1+dev53 --- README.md | 4 ++++ fsw/src/sch_lab_version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c97924a..4b36d41 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,10 @@ To change the list of packets that sch_lab sends out, edit the schedule table lo ## Version History +### Development Build: v2.4.0-rc1+dev53 + +- Apply CFE_SB_ValueToMsgId where required +- See and ### Development Build: v2.4.0-rc1+dev47 - Allow command codes to be specified in sch_lab_table #85, add CmdCode to sch_lab_table diff --git a/fsw/src/sch_lab_version.h b/fsw/src/sch_lab_version.h index efc381e..1562e75 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 47 /*!< Development Build: Number of commits since baseline */ +#define SCH_LAB_BUILD_NUMBER 53 /*!< 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 */