From 949cf3b88f8cefa292265cb4cc8b0a673d855732 Mon Sep 17 00:00:00 2001 From: "daniel.m.knutsen@mail.nasa.gov" Date: Fri, 28 Jun 2024 14:46:03 -0400 Subject: [PATCH 1/2] Fix 2572, CFE_TIME unit test failure when CFE_MISSION_TIME_AT_TONE_WILL_BE set to true --- modules/time/ut-coverage/time_UT.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/time/ut-coverage/time_UT.c b/modules/time/ut-coverage/time_UT.c index f06ee008a..36b1a65ad 100644 --- a/modules/time/ut-coverage/time_UT.c +++ b/modules/time/ut-coverage/time_UT.c @@ -1081,7 +1081,7 @@ void Test_External(void) /* Test setting time data from MET (external source, state set) */ UT_InitData(); CFE_TIME_Global.ClockSource = CFE_TIME_SourceSelect_EXTERNAL; - CFE_TIME_Global.ClockSetState = CFE_TIME_SetState_WAS_SET; + CFE_TIME_Global.ClockSetState = CFE_TIME_SetState_NOT_SET; settime.Seconds = 10; settime.Subseconds = 0; CFE_TIME_Global.ExternalCount = 0; @@ -1179,7 +1179,7 @@ void Test_External(void) /* Test setting time data from GPS (external source, state set) */ UT_InitData(); CFE_TIME_Global.ClockSource = CFE_TIME_SourceSelect_EXTERNAL; - CFE_TIME_Global.ClockSetState = CFE_TIME_SetState_WAS_SET; + CFE_TIME_Global.ClockSetState = CFE_TIME_SetState_NOT_SET; settime.Seconds = 10; settime.Subseconds = 0; CFE_TIME_Global.ExternalCount = 0; @@ -1279,7 +1279,7 @@ void Test_External(void) /* Test setting time data from Time (external source, state set) */ UT_InitData(); CFE_TIME_Global.ClockSource = CFE_TIME_SourceSelect_EXTERNAL; - CFE_TIME_Global.ReferenceState[0].ClockSetState = CFE_TIME_SetState_WAS_SET; + CFE_TIME_Global.ReferenceState[0].ClockSetState = CFE_TIME_SetState_NOT_SET; settime.Seconds = 10; settime.Subseconds = 0; CFE_TIME_Global.ExternalCount = 0; From e06b53ac08464b2db3aad8c44f576016f7f7fb2b Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 15 Jul 2024 11:27:26 -0400 Subject: [PATCH 2/2] Updating documentation and version numbers for equuleus-rc1+dev167 --- CHANGELOG.md | 4 ++++ modules/core_api/fsw/inc/cfe_version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7e98470b..27ae27cdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Development Build: equuleus-rc1+dev167 +- CFE_TIME unit test failure when CFE_MISSION_TIME_AT_TONE_WILL_BE set to true +- See + ## Development Build: equuleus-rc1+dev163 - Improve CFE_SB_AllocateMessageBuffer error report - Update CFE_PLATFORM_ES_DEFAULT_SYSLOG_MODE macro in es_verify.h diff --git a/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h index efc7bf9de..0f450b56b 100644 --- a/modules/core_api/fsw/inc/cfe_version.h +++ b/modules/core_api/fsw/inc/cfe_version.h @@ -26,7 +26,7 @@ #define CFE_VERSION_H /* Development Build Macro Definitions */ -#define CFE_BUILD_NUMBER 163 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */ +#define CFE_BUILD_NUMBER 167 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */ #define CFE_BUILD_BASELINE "equuleus-rc1" /**< @brief Development: Reference git tag for build number */ #define CFE_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */ #define CFE_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */