Merge pull request #736 from nasa/integration-candidate

IC: equuleus-rc1+dev4
nasa · Feb 2, 2024 · b211247 · b211247
2 parents a0c35aa + 61755ff
commit b211247
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apps/ci_lab b/apps/ci_lab
diff --git a/cfe b/cfe
+4 −0		CHANGELOG.md
+5 −0		config/default_ci_lab_msgstruct.h
+11 −1		eds/ci_lab.xml
+8 −0		fsw/src/ci_lab_cmds.c
+15 −0		fsw/src/ci_lab_cmds.h
+1 −2		fsw/src/ci_lab_dispatch.c
+17 −7		fsw/src/ci_lab_eds_dispatch.c
+1 −1		fsw/src/ci_lab_version.h
+5 −0		CHANGELOG.md
+15 −1		CMakeLists.txt
+11 −0		cmake/arch_build.cmake
+15 −1		cmake/global_functions.cmake
+2 −7		cmake/mission_build.cmake
+35 −0		cmake/mission_defaults.cmake
+61 −45		cmake/sample_defs/eds/cfe-topicids.xml
+32 −8		cmake/sample_defs/eds/config.xml
+31 −1		cmake/target/CMakeLists.txt
+34 −0		cmake/target/inc/target_config.h
+79 −1		cmake/target/src/target_config.c
+4 −0		modules/config/fsw/src/cfe_config_init.c
+2 −0		modules/config/mission_build.cmake
+7 −1		modules/core_api/CMakeLists.txt
+1 −0		modules/core_api/eds/base_types.xml
+0 −226		modules/core_api/eds/ccsds_spacepacket.xml
+0 −160		modules/core_api/eds/cfe_fs.xml
+0 −57		modules/core_api/eds/config.xml
+1 −1		modules/core_api/fsw/inc/cfe_version.h
+0 −143		modules/core_private/eds/base_types.xml
+0 −57		modules/core_private/eds/config.xml
+0 −6		modules/evs/fsw/src/cfe_evs_task.c
+1 −2		modules/evs/ut-coverage/evs_UT.c
+0 −10		modules/tbl/eds/cfe_tbl.xml