Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cFE Integration candidate: Caelum-rc4+dev64 #2464

Merged
merged 6 commits into from
Nov 14, 2023
Merged

cFE Integration candidate: Caelum-rc4+dev64 #2464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1ab90b5
Fix #2406 Remove nonexist reference for perf tool
irowebbn Jul 21, 2023
f909d9d
Fix #2461, rename reference table
jphickey Nov 1, 2023
d57e537
Merge pull request #2462 from jphickey:fix-2461-table-rename
dzbaker Nov 13, 2023
3371fb8
Merge pull request #2408 from irowebbn:2406-remove-perfid-manual-ref
dzbaker Nov 13, 2023
4a1501b
Updating documentation and version numbers for v7.0.0-rc4+dev411
dzbaker Nov 13, 2023
cd0b204
HotFix #2464, update startup script entry points
jphickey Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## Development Build: v7.0.0-rc4+dev411
- rename reference table
- Remove nonexist reference for perf tool
- See <https://github.com/nasa/cFE/pull/2462> and <https://github.com/nasa/cFE/pull/2408>

## Development Build: v7.0.0-rc4+dev405
- add code coverage for null check
- See <https://github.com/nasa/cFE/pull/2377>
Expand Down
4 changes: 2 additions & 2 deletions cmake/sample_defs/cpu1_cfe_es_startup.scr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion modules/cfe_testcase/src/cfe_test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion modules/cfe_testcase/src/tbl_registration_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions modules/core_api/fsw/inc/cfe_es.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1451,7 +1451,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
Expand All @@ -1470,7 +1470,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
Expand All @@ -1491,7 +1491,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:

Expand Down
2 changes: 1 addition & 1 deletion modules/core_api/fsw/inc/cfe_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
Loading