Merge pull request #536 from nasa/integration-candidate · nasa/cFS@6b2894c

Commit

Merge pull request #536 from nasa/integration-candidate

IC: Caelum-rc4+dev15

dzbaker authored Aug 4, 2022

2 parents ce32c70 + 7ad4504 commit 6b2894c

cfe

Submodule cfe updated 22 files

+7 −0		README.md
+2 −3		cmake/arch_build.cmake
+24 −0		cmake/sample_defs/cpu1_platform_cfg.h
+6 −0		docs/cFE_FunctionalRequirements.csv
+29 −1		docs/src/cfe_evs.dox
+ −		docs/src/evs_squelch_states.png
+1 −1		docs/src/mnem_maps/cfe_evs_tlm_mnem_map
+25 −0		modules/cfe_testcase/src/evs_send_test.c
+8 −0		modules/core_api/fsw/inc/cfe_error.h
+1 −1		modules/core_api/fsw/inc/cfe_version.h
+0 −1		modules/es/ut-coverage/es_UT.c
+5 −0		modules/evs/eds/cfe_evs.xml
+13 −0		modules/evs/fsw/inc/cfe_evs_events.h
+8 −8		modules/evs/fsw/inc/cfe_evs_msg.h
+38 −16		modules/evs/fsw/src/cfe_evs.c
+14 −7		modules/evs/fsw/src/cfe_evs_task.c
+15 −8		modules/evs/fsw/src/cfe_evs_task.h
+123 −0		modules/evs/fsw/src/cfe_evs_utils.c
+12 −0		modules/evs/fsw/src/cfe_evs_utils.h
+8 −0		modules/evs/fsw/src/cfe_evs_verify.h
+168 −0		modules/evs/ut-coverage/evs_UT.c
+16 −0		modules/evs/ut-coverage/evs_UT.h

osal

Submodule osal updated 4 files

+6 −0		README.md
+1 −1		src/os/inc/osapi-version.h
+21 −3		src/os/rtems/src/os-impl-timebase.c
+0 −2		src/unit-tests/osfile-test/ut_osfile_test.c

Please sign in to comment.