Merge pull request #723 from nasa/integration-candidate

IC: Caelum-rc4+dev66
nasa · Dec 12, 2023 · 18e228d · 18e228d
2 parents bb0d80c + 9d3f786
commit 18e228d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/apps/ci_lab b/apps/ci_lab
diff --git a/apps/sample_app b/apps/sample_app
diff --git a/apps/sch_lab b/apps/sch_lab
diff --git a/apps/to_lab b/apps/to_lab
diff --git a/cfe b/cfe
diff --git a/osal b/osal
+4 −0		CHANGELOG.md
+7 −1		arch_build.cmake
+5 −3		config/default_ci_lab_msgids.h
+30 −0		config/default_ci_lab_topicids.h
+1 −1		fsw/src/ci_lab_version.h
+1 −0		mission_build.cmake
+5 −1		CHANGELOG.md
+7 −1		arch_build.cmake
+6 −5		config/default_sample_app_msgids.h
+30 −0		config/default_sample_app_topicids.h
+1 −1		fsw/src/sample_app_version.h
+1 −0		mission_build.cmake
+6 −0		CHANGELOG.md
+78 −1		cmake/arch_build.cmake
+75 −0		cmake/mission_build.cmake
+9 −11		cmake/sample_defs/example_platform_cfg.h
+9 −9		docs/cFE Application Developers Guide.md
+2 −2		docs/src/cfe_time.dox
+2 −2		modules/cfe_testcase/config/default_cfe_test_msgids.h
+2 −2		modules/cfe_testcase/config/default_cfe_test_topicids.h
+2 −2		modules/cfe_testcase/src/sb_sendrecv_test.c
+1 −1		modules/cfe_testcase/src/sb_subscription_test.c
+21 −11		modules/core_api/arch_build.cmake
+64 −8		modules/core_api/config/default_cfe_core_api_base_msgids.h
+1 −1		modules/core_api/fsw/inc/cfe_version.h
+35 −17		modules/core_api/mission_build.cmake
+6 −3		modules/es/arch_build.cmake
+15 −1		modules/es/config/default_cfe_es_msgdefs.h
+5 −5		modules/es/config/default_cfe_es_msgids.h
+5 −5		modules/es/config/default_cfe_es_topicids.h
+18 −16		modules/es/fsw/src/cfe_es_perf.h
+163 −121		modules/es/ut-coverage/es_UT.c
+3 −3		modules/evs/arch_build.cmake
+8 −5		modules/evs/config/default_cfe_evs_msgids.h
+5 −5		modules/evs/config/default_cfe_evs_topicids.h
+27 −24		modules/evs/ut-coverage/evs_UT.c
+3 −3		modules/sb/arch_build.cmake
+7 −7		modules/sb/config/default_cfe_sb_msgids.h
+7 −7		modules/sb/config/default_cfe_sb_topicids.h
+40 −36		modules/sb/ut-coverage/sb_UT.c
+2 −2		modules/sb/ut-coverage/sb_UT.h
+3 −3		modules/tbl/arch_build.cmake
+4 −4		modules/tbl/config/default_cfe_tbl_msgids.h
+4 −4		modules/tbl/config/default_cfe_tbl_topicids.h
+6 −6		modules/tbl/ut-coverage/tbl_UT.c
+3 −3		modules/time/arch_build.cmake
+11 −11		modules/time/config/default_cfe_time_fcncodes.h
+2 −2		modules/time/config/default_cfe_time_internal_cfg.h
+17 −8		modules/time/config/default_cfe_time_msgids.h
+8 −8		modules/time/config/default_cfe_time_topicids.h
+4 −4		modules/time/eds/cfe_time.xml
+6 −6		modules/time/fsw/inc/cfe_time_eventids.h
+3 −3		modules/time/fsw/src/cfe_time_dispatch.c
+8 −8		modules/time/fsw/src/cfe_time_task.c
+3 −3		modules/time/fsw/src/cfe_time_tone.c
+1 −1		modules/time/fsw/src/cfe_time_utils.c
+8 −8		modules/time/fsw/src/cfe_time_utils.h
+6 −6		modules/time/fsw/src/cfe_time_verify.h
+18 −18		modules/time/ut-coverage/time_UT.c