From 990f1203a93e556fdabb62621a56a38cb251265d Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 3 Jan 2024 17:11:42 +0000 Subject: [PATCH 1/3] Fix #162, CFE_TIME_1HZ_CMD_MID deprecated --- 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 2fe95c2..15196cc 100644 --- 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"); From 7864b37a1864e737938faf7c500d8c1f12880b47 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 3 Jan 2024 18:25:07 +0000 Subject: [PATCH 2/3] Fix #158, SC_1HZ_WAKEUP_MID deprecated --- fsw/tables/sch_lab_table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsw/tables/sch_lab_table.c b/fsw/tables/sch_lab_table.c index 2e62521..d0b1108 100644 --- 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 */ From 179d84ae0daf1eaccc4d8829f1fc9df59dadbfda Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 4 Jan 2024 16:45:30 -0500 Subject: [PATCH 3/3] Updating documentation and version numbers for v2.5.0-rc4+dev83 --- CHANGELOG.md | 5 +++++ fsw/src/sch_lab_version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4767cb8..90c45b0 100644 --- 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 and + ## Development Build: v2.5.0-rc4+dev75 - correct inclusion for SCH_LAB example table - See diff --git a/fsw/src/sch_lab_version.h b/fsw/src/sch_lab_version.h index 93b31d1..a66ba0f 100644 --- 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 */