Skip to content

Commit

Permalink
Merge pull request #136 from nasa/integration-candidate
Browse files Browse the repository at this point in the history 
Integration Candidate: 2020-09-02
  • Loading branch information
@yammajamma
yammajamma authored Sep 9, 2020
2 parents ffb30d8 + 893a98b commit 9f0b3ad
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 82 files
+10 −0 README.md
+14 −27 cmake/arch_build.cmake
+57 −25 cmake/global_functions.cmake
+0 −15 cmake/sample_defs/cpu1_msgids.h
+2 −220 cmake/sample_defs/cpu1_platform_cfg.h
+0 −91 cmake/sample_defs/sample_mission_cfg.h
+32 −38 cmake/sample_defs/targets.cmake
+32 −31 cmake/target/CMakeLists.txt
+8 −8 docs/cFE Application Developers Guide.md
+0 −9 docs/src/cfe_api.dox
+16 −16 docs/src/cfe_es.dox
+3 −3 docs/src/cfe_evs.dox
+2 −2 docs/src/cfe_glossary.dox
+6 −6 docs/src/cfe_sb.dox
+3 −3 docs/src/cfe_tbl.dox
+30 −30 docs/src/cfe_time.dox
+6 −6 docs/src/mnem_maps/cfe_evs_tlm_mnem_map
+6 −6 docs/src/mnem_maps/cfe_sb_tlm_mnem_map
+9 −9 fsw/cfe-core/eds/cfe_sb.xml
+2 −2 fsw/cfe-core/eds/cfe_time.xml
+410 −225 fsw/cfe-core/src/es/cfe_es_api.c
+259 −145 fsw/cfe-core/src/es/cfe_es_apps.c
+11 −4 fsw/cfe-core/src/es/cfe_es_apps.h
+8 −36 fsw/cfe-core/src/es/cfe_es_cds.c
+0 −21 fsw/cfe-core/src/es/cfe_es_cds.h
+13 −6 fsw/cfe-core/src/es/cfe_es_erlog.c
+216 −0 fsw/cfe-core/src/es/cfe_es_global.h
+1 −1 fsw/cfe-core/src/es/cfe_es_log.h
+0 −432 fsw/cfe-core/src/es/cfe_es_shell.c
+0 −68 fsw/cfe-core/src/es/cfe_es_shell.h
+46 −35 fsw/cfe-core/src/es/cfe_es_start.c
+36 −91 fsw/cfe-core/src/es/cfe_es_task.c
+0 −10 fsw/cfe-core/src/es/cfe_es_task.h
+6 −3 fsw/cfe-core/src/es/cfe_esmempool.c
+44 −50 fsw/cfe-core/src/evs/cfe_evs.c
+78 −76 fsw/cfe-core/src/evs/cfe_evs_task.c
+91 −48 fsw/cfe-core/src/evs/cfe_evs_utils.c
+115 −11 fsw/cfe-core/src/evs/cfe_evs_utils.h
+0 −114 fsw/cfe-core/src/fs/cfe_fs_api.c
+0 −1,230 fsw/cfe-core/src/fs/cfe_fs_decompress.c
+0 −155 fsw/cfe-core/src/fs/cfe_fs_decompress.h
+4 −4 fsw/cfe-core/src/fs/cfe_fs_priv.c
+0 −26 fsw/cfe-core/src/inc/ccsds.h
+0 −144 fsw/cfe-core/src/inc/cfe_error.h
+115 −89 fsw/cfe-core/src/inc/cfe_es.h
+0 −30 fsw/cfe-core/src/inc/cfe_es_events.h
+0 −113 fsw/cfe-core/src/inc/cfe_es_msg.h
+0 −31 fsw/cfe-core/src/inc/cfe_evs.h
+0 −17 fsw/cfe-core/src/inc/cfe_evs_msg.h
+0 −116 fsw/cfe-core/src/inc/cfe_fs.h
+1 −2 fsw/cfe-core/src/inc/cfe_fs_extern_typedefs.h
+0 −51 fsw/cfe-core/src/inc/cfe_sb.h
+0 −46 fsw/cfe-core/src/inc/cfe_sb_events.h
+1 −17 fsw/cfe-core/src/inc/cfe_sb_msg.h
+0 −16 fsw/cfe-core/src/inc/cfe_tbl.h
+0 −16 fsw/cfe-core/src/inc/cfe_tbl_msg.h
+0 −105 fsw/cfe-core/src/inc/cfe_time.h
+0 −16 fsw/cfe-core/src/inc/cfe_time_msg.h
+1 −1 fsw/cfe-core/src/inc/cfe_version.h
+32 −104 fsw/cfe-core/src/sb/cfe_sb_api.c
+2 −2 fsw/cfe-core/src/sb/cfe_sb_msg_id_util.c
+19 −9 fsw/cfe-core/src/sb/cfe_sb_priv.c
+0 −3 fsw/cfe-core/src/sb/cfe_sb_priv.h
+36 −30 fsw/cfe-core/src/tbl/cfe_tbl_api.c
+12 −34 fsw/cfe-core/src/tbl/cfe_tbl_internal.c
+0 −21 fsw/cfe-core/src/tbl/cfe_tbl_internal.h
+16 −66 fsw/cfe-core/src/time/cfe_time_api.c
+8 −3 fsw/cfe-core/src/time/cfe_time_utils.c
+3 −1 fsw/cfe-core/unit-test/CMakeLists.txt
+951 −1,156 fsw/cfe-core/unit-test/es_UT.c
+1 −1 fsw/cfe-core/unit-test/es_UT.h
+73 −64 fsw/cfe-core/unit-test/evs_UT.c
+2 −2 fsw/cfe-core/unit-test/fs_UT.c
+29 −12 fsw/cfe-core/unit-test/sb_UT.c
+43 −50 fsw/cfe-core/unit-test/tbl_UT.c
+12 −9 fsw/cfe-core/unit-test/time_UT.c
+2 −0 fsw/cfe-core/unit-test/ut_osprintf_stubs.c
+1 −0 fsw/cfe-core/unit-test/ut_osprintf_stubs.h
+111 −3 fsw/cfe-core/ut-stubs/ut_es_stubs.c
+0 −88 fsw/cfe-core/ut-stubs/ut_fs_stubs.c
+0 −16 fsw/cfe-core/ut-stubs/ut_sb_stubs.c
+3 −2 modules/msg/src/cfe_msg_sechdr_checksum.c
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 107 files
2 changes: 1 addition & 1 deletion tools/cFS-GroundSystem
Submodule cFS-GroundSystem updated 4 files
+6 −0 README.md
+35 −55 Subsystems/cmdUtil/SendUdp.c
+1 −1 Subsystems/cmdUtil/cmdUtil.c
+1 −1 _version.py

0 comments on commit 9f0b3ad

Please sign in to comment.