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.

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

Integration Candidate COMBINED 2020-04-29 and 2020-05-06 #83

Merged
merged 12 commits into from
May 13, 2020
2 changes: 1 addition & 1 deletion .lgtm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ extraction:
build_command:
- "cp cfe/cmake/Makefile.sample Makefile"
- "cp -r cfe/cmake/sample_defs sample_defs"
- "make prep"
- "make OMIT_DEPRECATED=true prep"
- "make"

4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,7 @@ script:
grep -i 'warn\|err\|fail' cFS_startup.txt
exit -1
fi
# After script sleep avoids Job log truncation
after_script:
- sleep 1
2 changes: 1 addition & 1 deletion apps/ci_lab
2 changes: 1 addition & 1 deletion apps/sch_lab
2 changes: 1 addition & 1 deletion apps/to_lab
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 69 files
+62 −37 README.md
+9 −166 cmake/cfe-common.doxyfile.in
+0 −166 cmake/osal-common.doxyfile.in
+7 −1 cmake/sample_defs/cpu1_msgids.h
+1 −47 cmake/sample_defs/cpu1_platform_cfg.h
+2 −0 cmake/sample_defs/sample_mission_cfg.h
+9 −4 cmake/target/inc/target_config.h
+3 −2 cmake/target/src/target_config.c
+268 −0 docs/src/cfe_api.dox
+0 −1 docs/src/cfe_es.dox
+87 −0 docs/src/cfe_glossary.dox
+2 −4 docs/src/cfe_sb.dox
+2 −360 docs/src/main.dox
+13 −125 fsw/cfe-core/src/es/cfe_es_api.c
+7 −227 fsw/cfe-core/src/es/cfe_es_apps.c
+10 −5 fsw/cfe-core/src/es/cfe_es_apps.h
+12 −0 fsw/cfe-core/src/es/cfe_es_backgroundtask.c
+2 −1 fsw/cfe-core/src/es/cfe_es_cds.c
+6 −7 fsw/cfe-core/src/es/cfe_es_cds.h
+337 −71 fsw/cfe-core/src/es/cfe_es_erlog.c
+38 −3 fsw/cfe-core/src/es/cfe_es_log.h
+6 −0 fsw/cfe-core/src/es/cfe_es_shell.c
+21 −21 fsw/cfe-core/src/es/cfe_es_start.c
+32 −86 fsw/cfe-core/src/es/cfe_es_task.c
+30 −1 fsw/cfe-core/src/es/cfe_es_task.h
+0 −10 fsw/cfe-core/src/es/cfe_es_verify.h
+2 −1 fsw/cfe-core/src/fs/cfe_fs_api.c
+3 −1 fsw/cfe-core/src/fs/cfe_fs_decompress.c
+27 −12 fsw/cfe-core/src/inc/cfe_error.h
+38 −57 fsw/cfe-core/src/inc/cfe_es.h
+13 −15 fsw/cfe-core/src/inc/cfe_es_events.h
+20 −4 fsw/cfe-core/src/inc/cfe_es_msg.h
+1 −0 fsw/cfe-core/src/inc/cfe_evs_msg.h
+14 −11 fsw/cfe-core/src/inc/cfe_fs.h
+220 −219 fsw/cfe-core/src/inc/cfe_sb.h
+4 −2 fsw/cfe-core/src/inc/cfe_sb_msg.h
+14 −24 fsw/cfe-core/src/inc/cfe_tbl.h
+34 −15 fsw/cfe-core/src/inc/cfe_tbl_events.h
+13 −9 fsw/cfe-core/src/inc/cfe_time.h
+2 −2 fsw/cfe-core/src/inc/cfe_time_msg.h
+1 −1 fsw/cfe-core/src/inc/cfe_version.h
+41 −6 fsw/cfe-core/src/inc/private/cfe_es_erlog_typedef.h
+1 −1 fsw/cfe-core/src/inc/private/cfe_es_resetdata_typedef.h
+6 −7 fsw/cfe-core/src/inc/private/cfe_private.h
+1 −1 fsw/cfe-core/src/sb/cfe_sb_msg_id_util.c
+14 −16 fsw/cfe-core/src/sb/cfe_sb_priv.h
+40 −21 fsw/cfe-core/src/sb/cfe_sb_task.c
+15 −15 fsw/cfe-core/src/sb/cfe_sb_util.c
+4 −2 fsw/cfe-core/src/tbl/cfe_tbl_internal.c
+18 −30 fsw/cfe-core/src/tbl/cfe_tbl_internal.h
+2 −2 fsw/cfe-core/src/tbl/cfe_tbl_task.h
+8 −6 fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c
+24 −25 fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.h
+2 −2 fsw/cfe-core/src/time/cfe_time_api.c
+2 −3 fsw/cfe-core/src/time/cfe_time_utils.h
+142 −858 fsw/cfe-core/unit-test/es_UT.c
+2 −48 fsw/cfe-core/unit-test/es_UT.h
+4 −0 fsw/cfe-core/unit-test/evs_UT.c
+0 −209 fsw/cfe-core/unit-test/fs_UT.c
+0 −1 fsw/cfe-core/unit-test/fs_UT.h
+38 −12 fsw/cfe-core/unit-test/sb_UT.c
+10 −9 fsw/cfe-core/unit-test/tbl_UT.c
+10 −121 fsw/cfe-core/unit-test/time_UT.c
+0 −21 fsw/cfe-core/unit-test/time_UT.h
+0 −385 fsw/cfe-core/unit-test/ut_fs_zipfile.h
+145 −3 fsw/cfe-core/unit-test/ut_support.c
+257 −0 fsw/cfe-core/unit-test/ut_support.h
+3 −0 fsw/cfe-core/ut-stubs/ut_fs_stubs.c
+75 −88 fsw/cfe-core/ut-stubs/ut_sb_stubs.c
2 changes: 1 addition & 1 deletion tools/elf2cfetbl