From 1ab90b5435bf0eefc499044c77fd72c1be06a895 Mon Sep 17 00:00:00 2001 From: Isaac Rowe <9010221+irowebbn@users.noreply.github.com> Date: Fri, 21 Jul 2023 09:32:05 -0500 Subject: [PATCH 1/4] Fix #2406 Remove nonexist reference for perf tool --- modules/core_api/fsw/inc/cfe_es.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/core_api/fsw/inc/cfe_es.h b/modules/core_api/fsw/inc/cfe_es.h index cac2c8f03..26f98bf6b 100644 --- a/modules/core_api/fsw/inc/cfe_es.h +++ b/modules/core_api/fsw/inc/cfe_es.h @@ -1458,7 +1458,7 @@ CFE_Status_t CFE_ES_GetMemPoolStats(CFE_ES_MemPoolStats_t *BufPtr, CFE_ES_MemHan ** \par Description ** This macro logs the entry or start event/marker for the specified ** entry \c id. This macro, in conjunction with the #CFE_ES_PerfLogExit, -** is used by the Software Performance Analysis tool (see section 5.15). +** is used by the Software Performance Analysis tool. ** ** \par Assumptions, External Events, and Notes: ** None @@ -1477,7 +1477,7 @@ CFE_Status_t CFE_ES_GetMemPoolStats(CFE_ES_MemPoolStats_t *BufPtr, CFE_ES_MemHan ** \par Description ** This macro logs the exit or end event/marker for the specified ** entry \c id. This macro, in conjunction with the #CFE_ES_PerfLogEntry, -** is used by the Software Performance Analysis tool (see section 5.15). +** is used by the Software Performance Analysis tool. ** ** \par Assumptions, External Events, and Notes: ** None @@ -1498,7 +1498,7 @@ CFE_Status_t CFE_ES_GetMemPoolStats(CFE_ES_MemPoolStats_t *BufPtr, CFE_ES_MemHan ** \par Description ** This function logs the entry and exit marker for the specified ** \c id. This function is used by the Software Performance Analysis -** tool (see section 5.15). +** tool. ** ** \par Assumptions, External Events, and Notes: From f909d9d1abebe3e7167b0d9be5b161944d3ab4c4 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Wed, 1 Nov 2023 15:35:39 -0400 Subject: [PATCH 2/4] Fix #2461, rename reference table The sample_app provides "ExampleTable" now. --- modules/cfe_testcase/src/cfe_test.h | 2 +- modules/cfe_testcase/src/tbl_registration_test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/cfe_testcase/src/cfe_test.h b/modules/cfe_testcase/src/cfe_test.h index c31e83a5a..a7864c370 100644 --- a/modules/cfe_testcase/src/cfe_test.h +++ b/modules/cfe_testcase/src/cfe_test.h @@ -66,7 +66,7 @@ extern CFE_FT_Global_t CFE_FT_Global; * This filename was made configurable such that projects can replace the * sample app table with a project specific table for the purpose of CI/CD. */ -#define CFE_ASSERT_SHARED_TBL_NAME "SAMPLE_APP.SampleAppTable" +#define CFE_ASSERT_SHARED_TBL_NAME "SAMPLE_APP.ExampleTable" void TimeInRange(CFE_TIME_SysTime_t Start, CFE_TIME_SysTime_t Time, CFE_TIME_SysTime_t Range, const char *Str); diff --git a/modules/cfe_testcase/src/tbl_registration_test.c b/modules/cfe_testcase/src/tbl_registration_test.c index c4f237d4e..84f848b0a 100644 --- a/modules/cfe_testcase/src/tbl_registration_test.c +++ b/modules/cfe_testcase/src/tbl_registration_test.c @@ -191,7 +191,7 @@ void TestTableShare(void) UtPrintf("Testing: CFE_TBL_Share"); CFE_TBL_Handle_t SharedTblHandle; const char * SharedTblName = CFE_ASSERT_SHARED_TBL_NAME; - const char * BadTblName = "SampleAppTable"; + const char * BadTblName = "ExampleTable"; UtAssert_INT32_EQ(CFE_TBL_Share(NULL, SharedTblName), CFE_TBL_BAD_ARGUMENT); UtAssert_INT32_EQ(CFE_TBL_Share(&SharedTblHandle, SharedTblName), CFE_SUCCESS); From 4a1501b0c0797072ccc64fe30636e6468fa779e9 Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 13 Nov 2023 14:41:34 -0500 Subject: [PATCH 3/4] Updating documentation and version numbers for v7.0.0-rc4+dev411 --- CHANGELOG.md | 5 +++++ modules/core_api/fsw/inc/cfe_version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 588758355..b2ac3cefa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## Development Build: v7.0.0-rc4+dev411 +- rename reference table +- Remove nonexist reference for perf tool +- See and + ## Development Build: v7.0.0-rc4+dev405 - add code coverage for null check - See diff --git a/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h index 584b8d417..39a53331e 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 405 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */ +#define CFE_BUILD_NUMBER 411 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */ #define CFE_BUILD_BASELINE "v7.0.0-rc4" /**< @brief Development: Reference git tag for build number */ /* See \ref cfsversions for definitions */ From cd0b2046f35af03ceb5a7a06363685b505570108 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Tue, 14 Nov 2023 11:03:47 -0500 Subject: [PATCH 4/4] HotFix #2464, update startup script entry points Update the entry point names in startup script --- cmake/sample_defs/cpu1_cfe_es_startup.scr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/sample_defs/cpu1_cfe_es_startup.scr b/cmake/sample_defs/cpu1_cfe_es_startup.scr index 87a318875..16003c5bc 100644 --- a/cmake/sample_defs/cpu1_cfe_es_startup.scr +++ b/cmake/sample_defs/cpu1_cfe_es_startup.scr @@ -1,9 +1,9 @@ CFE_LIB, cfe_assert, CFE_Assert_LibInit, ASSERT_LIB, 0, 0, 0x0, 0; CFE_LIB, sample_lib, SAMPLE_LIB_Init, SAMPLE_LIB, 0, 0, 0x0, 0; CFE_APP, sample_app, SAMPLE_APP_Main, SAMPLE_APP, 50, 16384, 0x0, 0; -CFE_APP, ci_lab, CI_Lab_AppMain, CI_LAB_APP, 60, 16384, 0x0, 0; +CFE_APP, ci_lab, CI_LAB_AppMain, CI_LAB_APP, 60, 16384, 0x0, 0; CFE_APP, to_lab, TO_LAB_AppMain, TO_LAB_APP, 70, 16384, 0x0, 0; -CFE_APP, sch_lab, SCH_Lab_AppMain, SCH_LAB_APP, 80, 16384, 0x0, 0; +CFE_APP, sch_lab, SCH_LAB_AppMain, SCH_LAB_APP, 80, 16384, 0x0, 0; ! ! Startup script fields: ! 1. Object Type -- CFE_APP for an Application, or CFE_LIB for a library.