From b900c36107c29b04f0ab8bae178398228296014e Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Tue, 11 Aug 2020 15:00:26 -0400 Subject: [PATCH 1/7] Fix #798, Remove OS_Milli2Ticks document reference (deprecated) --- docs/cFE Application Developers Guide.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/cFE Application Developers Guide.md b/docs/cFE Application Developers Guide.md index 329cff100..2fc0cc7ba 100644 --- a/docs/cFE Application Developers Guide.md +++ b/docs/cFE Application Developers Guide.md @@ -605,15 +605,9 @@ Application Developer are the following: multiple processors on the same spacecraft. For understanding and compensating for the processor timer on a -particular platform, the following two functions provide important +particular platform, the following function provides important information. -- OS_Milli2Ticks converts a given number of milliseconds into the -appropriate number of processor clock ticks for a given amount of time. -The Developer should never hard-code a time related value in clock -ticks. When the code is ported to another processor, it is important for -any time values to automatically adjust appropriately. - - OS_InfoGetTicks returns the number of microseconds per operating system clock tick. This can also be used to calculate the appropriate number of system clock ticks for a specific delta time. An example can be seen From 9405d1e811ea413951274953cc4a4362ca2bfc28 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Fri, 21 Aug 2020 12:08:12 -0400 Subject: [PATCH 2/7] Fix #822, Remove iterator modification in loop --- fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c b/fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c index 4c3bc3c81..cc49e0968 100644 --- a/fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c +++ b/fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c @@ -1375,7 +1375,7 @@ int32 CFE_TBL_DeleteCDSCmd(const CFE_TBL_DeleteCDS_t *data) if (strncmp(CFE_TBL_TaskData.CritReg[i].Name, TableName, CFE_TBL_MAX_FULL_NAME_LEN) == 0) { CritRegRecPtr = &CFE_TBL_TaskData.CritReg[i]; - i=CFE_PLATFORM_TBL_MAX_CRITICAL_TABLES; + break; } } From 9887b53fda36c0d49f357016ee085b82f1f5f034 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Fri, 21 Aug 2020 14:42:09 -0400 Subject: [PATCH 3/7] Fix #831, Resolve int size mismatch in loop comparison --- fsw/cfe-core/src/sb/cfe_sb_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsw/cfe-core/src/sb/cfe_sb_api.c b/fsw/cfe-core/src/sb/cfe_sb_api.c index 3c446f106..1902aeb30 100644 --- a/fsw/cfe-core/src/sb/cfe_sb_api.c +++ b/fsw/cfe-core/src/sb/cfe_sb_api.c @@ -1182,7 +1182,7 @@ int32 CFE_SB_SendMsgFull(CFE_SB_Msg_t *MsgPtr, uint16 TotalMsgSize; CFE_SB_MsgRouteIdx_t RtgTblIdx; uint32 TskId = 0; - uint16 i; + uint32 i; char FullName[(OS_MAX_API_NAME * 2)]; CFE_SB_EventBuf_t SBSndErr; char PipeName[OS_MAX_API_NAME] = {'\0'}; From 1ea241bb215de3de94deaf50a77b3850c0cc2b5d Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Mon, 24 Aug 2020 12:46:03 -0400 Subject: [PATCH 4/7] Fix #818, Return message address from CFE_SB_SendMsg stub --- fsw/cfe-core/ut-stubs/ut_sb_stubs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fsw/cfe-core/ut-stubs/ut_sb_stubs.c b/fsw/cfe-core/ut-stubs/ut_sb_stubs.c index 1d6c7d33b..8a2893ea2 100644 --- a/fsw/cfe-core/ut-stubs/ut_sb_stubs.c +++ b/fsw/cfe-core/ut-stubs/ut_sb_stubs.c @@ -486,8 +486,7 @@ int32 CFE_SB_SendMsg(CFE_SB_Msg_t *MsgPtr) if (status >= 0) { - UT_Stub_CopyFromLocal(UT_KEY(CFE_SB_SendMsg), MsgPtr->Byte, - CFE_SB_StubMsg_GetMetaData(MsgPtr)->TotalLength); + UT_Stub_CopyFromLocal(UT_KEY(CFE_SB_SendMsg), &MsgPtr, sizeof(MsgPtr)); } return status; From 09f666224b209da917e9fcd4d47ced0d3f68b944 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Mon, 24 Aug 2020 17:53:00 -0400 Subject: [PATCH 5/7] Fix #836, Replace CFE_MISSION_SPACECRAFT_ID with CFE_PSP_GetSpacecraftId() --- modules/msg/src/cfe_msg_ccsdsext.c | 3 ++- modules/msg/unit-test-coverage/test_cfe_msg_ccsdsext.c | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/msg/src/cfe_msg_ccsdsext.c b/modules/msg/src/cfe_msg_ccsdsext.c index 6c7587c3b..658e9ac7d 100644 --- a/modules/msg/src/cfe_msg_ccsdsext.c +++ b/modules/msg/src/cfe_msg_ccsdsext.c @@ -25,6 +25,7 @@ #include "cfe_msg_priv.h" #include "cfe_msg_defaults.h" #include "cfe_error.h" +#include "cfe_psp.h" /* CCSDS Extended definitions */ #define CFE_MSG_EDSVER_SHIFT 11 /**< \brief CCSDS EDS version shift */ @@ -49,7 +50,7 @@ void CFE_MSG_SetDefaultCCSDSExt(CFE_MSG_Message_t *MsgPtr) /* Default bits of the subsystem, for whatever isn't set by MsgId */ CFE_MSG_SetSubsystem(MsgPtr, (CFE_MSG_Subsystem_t)CFE_PLATFORM_DEFAULT_SUBSYS); - CFE_MSG_SetSystem(MsgPtr, (CFE_MSG_System_t)CFE_MISSION_SPACECRAFT_ID); + CFE_MSG_SetSystem(MsgPtr, (CFE_MSG_System_t)CFE_PSP_GetSpacecraftId()); } /****************************************************************************** diff --git a/modules/msg/unit-test-coverage/test_cfe_msg_ccsdsext.c b/modules/msg/unit-test-coverage/test_cfe_msg_ccsdsext.c index 63b897f26..d0097833f 100644 --- a/modules/msg/unit-test-coverage/test_cfe_msg_ccsdsext.c +++ b/modules/msg/unit-test-coverage/test_cfe_msg_ccsdsext.c @@ -57,6 +57,7 @@ void Test_MSG_Init_Ext(void) CFE_MSG_System_t system; CFE_MSG_Endian_t endian; bool is_v1; + int sc_id = 0xab; /* Get msgid version by checking if msgid sets header version */ memset(&msg, 0xFF, sizeof(msg)); @@ -64,6 +65,9 @@ void Test_MSG_Init_Ext(void) ASSERT_EQ(CFE_MSG_GetHeaderVersion(&msg, &hdrver), CFE_SUCCESS); is_v1 = (hdrver == 0); + /* Set up return */ + UT_SetDeferredRetcode(UT_KEY(CFE_PSP_GetSpacecraftId), 1, sc_id); + UT_Text("Set to all F's, msgid value = 0, and run with clearing"); memset(&msg, 0xFF, sizeof(msg)); msgidval_exp = 0; @@ -83,7 +87,7 @@ void Test_MSG_Init_Ext(void) /* Default system check */ ASSERT_EQ(CFE_MSG_GetSystem(&msg, &system), CFE_SUCCESS); - ASSERT_EQ(system, CFE_MISSION_SPACECRAFT_ID); + ASSERT_EQ(system, sc_id); /* Default endian check */ ASSERT_EQ(CFE_MSG_GetEndian(&msg, &endian), CFE_SUCCESS); From 610276783674a395569e4232131757374407f70c Mon Sep 17 00:00:00 2001 From: Yasir Khan Date: Mon, 31 Aug 2020 14:57:51 -0400 Subject: [PATCH 6/7] HOTFIX IC-20200826: Removed deprecaded references from doxygen --- docs/src/osalmain.dox | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/src/osalmain.dox b/docs/src/osalmain.dox index c8a27737b..455626249 100644 --- a/docs/src/osalmain.dox +++ b/docs/src/osalmain.dox @@ -19,10 +19,6 @@
  • \ref OSAPIMsgQueue
  • \ref OSAPISem
  • \ref OSAPITime -
  • \ref OSAPIExc -
  • \ref OSAPIFPUExc -
  • \ref OSAPIInterrupt -
  • \ref OSAPIShMem
  • \ref OSAPIHeap
  • \ref OSAPIError
  • \ref OSAPISelect @@ -36,7 +32,6 @@
  • \subpage osalfsfd
  • \ref OSFileAccess
  • \ref OSFileOffset -
  • \ref OSVolType
  • APIs
    • \ref OSAPIFile From a6eccfd181f622d15176718da5c40c29c2a53f57 Mon Sep 17 00:00:00 2001 From: Yasir Khan Date: Tue, 1 Sep 2020 14:49:46 -0400 Subject: [PATCH 7/7] Increase version to 6.8.0-rc1+dev42, update readme --- README.md | 9 +++++++++ fsw/cfe-core/src/inc/cfe_version.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 71f7fdf6c..e9eebe94e 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,15 @@ The detailed cFE user's guide can be viewed at + ### Development Build: 6.8.0-rc1+dev28 - Add msg stubs, update SB_UT to use them, and remove msg module include from unit tests diff --git a/fsw/cfe-core/src/inc/cfe_version.h b/fsw/cfe-core/src/inc/cfe_version.h index 4745e1a95..78f83843f 100644 --- a/fsw/cfe-core/src/inc/cfe_version.h +++ b/fsw/cfe-core/src/inc/cfe_version.h @@ -35,7 +35,7 @@ /* Development Build Macro Definitions */ -#define CFE_BUILD_NUMBER 28 /*!< Development Build: Number of commits since baseline */ +#define CFE_BUILD_NUMBER 42 /*!< Development Build: Number of commits since baseline */ #define CFE_BUILD_BASELINE "v6.8.0-rc1" /*!< Development Build: git tag that is the base for the current development */ /* Version Macro Definitions */