Merge pull request #92 from nasa/integration-candidate

sch_lab Integration candidate: 2021-09-21
nasa · Sep 22, 2021 · 8124041 · 8124041
2 parents 19bf84c + d4d43f0
commit 8124041
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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 <https://github.com/nasa/sch_lab/pull/92> and <https://github.com/nasa/cFS/pull/359>
 ### 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_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");

diff --git 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 */