Merge pull request #165 from nasa/integration-candidate

sch_lab Integration candidate: Caelum-rc4+dev67
nasa · Jan 10, 2024 · 2bc1e11 · 2bc1e11
2 parents ff9e791 + 179d84a
commit 2bc1e11
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Development Build: v2.5.0-rc4+dev83
+- SC_1HZ_WAKEUP_MID deprecated
+- CFE_TIME_1HZ_CMD_MID deprecated
+- See <https://github.com/nasa/sch_lab/pull/164> and <https://github.com/nasa/sch_lab/pull/163>
+
 ## Development Build: v2.5.0-rc4+dev75
 - correct inclusion for SCH_LAB example table
 - See <https://github.com/nasa/sch_lab/pull/156>

diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c
@@ -285,7 +285,7 @@ CFE_Status_t SCH_LAB_AppInit(void)
         OS_printf("SCH Error creating pipe!\n");
     }
 
-    Status = CFE_SB_Subscribe(CFE_SB_ValueToMsgId(CFE_TIME_1HZ_CMD_MID), SCH_LAB_Global.CmdPipe);
+    Status = CFE_SB_Subscribe(CFE_SB_ValueToMsgId(CFE_TIME_ONEHZ_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
@@ -25,7 +25,7 @@
  */
 
 /* Development Build Macro Definitions */
-#define SCH_LAB_BUILD_NUMBER 75 /*!< Development Build: Number of commits since baseline */
+#define SCH_LAB_BUILD_NUMBER 83 /*!< Development Build: Number of commits since baseline */
 #define SCH_LAB_BUILD_BASELINE \
     "v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */
 

diff --git a/fsw/tables/sch_lab_table.c b/fsw/tables/sch_lab_table.c
@@ -85,7 +85,7 @@ SCH_LAB_ScheduleTable_t SCH_LAB_ScheduleTable = {
 #endif
 #ifdef HAVE_SC
         {CFE_SB_MSGID_WRAP_VALUE(SC_SEND_HK_MID), 92, 0},
-        {CFE_SB_MSGID_WRAP_VALUE(SC_1HZ_WAKEUP_MID), 91, 0},
+        {CFE_SB_MSGID_WRAP_VALUE(SC_ONEHZ_WAKEUP_MID), 91, 0},
 #endif
 #ifdef HAVE_HS
         {CFE_SB_MSGID_WRAP_VALUE(HS_SEND_HK_MID), 90, 0}, /* Example of a message that wouldn't be sent */