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.

Sign up for GitHub

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

Jump to bottom

Integration Candidate: 2020-09-09 #139

Merged
merged 4 commits into from
Sep 15, 2020
Merged

Integration Candidate: 2020-09-09 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b1b970
Update submodule IC-20200909
yammajamma Sep 11, 2020
59f8471
Add HOTFIX for parameter name mismatch
jphickey Sep 15, 2020
6a84da9
Updating for IC-20200909
yammajamma Sep 15, 2020
c5ec036
Update submodules to main IC-20200909
yammajamma Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cfe
Open in desktop
Submodule cfe updated 55 files
+11 −0 README.md
+121 −33 fsw/cfe-core/src/es/cfe_es_api.c
+24 −22 fsw/cfe-core/src/es/cfe_es_apps.c
+1 −1 fsw/cfe-core/src/es/cfe_es_apps.h
+1 −1 fsw/cfe-core/src/es/cfe_es_backgroundtask.c
+1 −1 fsw/cfe-core/src/es/cfe_es_cds.h
+1 −1 fsw/cfe-core/src/es/cfe_es_cds_mempool.h
+20 −19 fsw/cfe-core/src/es/cfe_es_erlog.c
+140 −3 fsw/cfe-core/src/es/cfe_es_global.h
+23 −15 fsw/cfe-core/src/es/cfe_es_perf.c
+1 −1 fsw/cfe-core/src/es/cfe_es_perf.h
+6 −3 fsw/cfe-core/src/es/cfe_es_start.c
+6 −4 fsw/cfe-core/src/es/cfe_es_syslog.c
+22 −16 fsw/cfe-core/src/es/cfe_es_task.c
+1 −1 fsw/cfe-core/src/es/cfe_esmempool.h
+6 −5 fsw/cfe-core/src/evs/cfe_evs_log.c
+6 −6 fsw/cfe-core/src/evs/cfe_evs_task.c
+1 −1 fsw/cfe-core/src/evs/cfe_evs_task.h
+3 −3 fsw/cfe-core/src/fs/cfe_fs_api.c
+1 −1 fsw/cfe-core/src/fs/cfe_fs_priv.h
+2 −2 fsw/cfe-core/src/inc/ccsds_hdr.h
+1 −1 fsw/cfe-core/src/inc/cfe_error.h
+7 −7 fsw/cfe-core/src/inc/cfe_es.h
+35 −35 fsw/cfe-core/src/inc/cfe_es_msg.h
+2 −2 fsw/cfe-core/src/inc/cfe_evs.h
+27 −27 fsw/cfe-core/src/inc/cfe_evs_msg.h
+3 −3 fsw/cfe-core/src/inc/cfe_fs.h
+1 −1 fsw/cfe-core/src/inc/cfe_fs_extern_typedefs.h
+4 −4 fsw/cfe-core/src/inc/cfe_msg_typedefs.h
+2 −2 fsw/cfe-core/src/inc/cfe_sb.h
+16 −16 fsw/cfe-core/src/inc/cfe_sb_msg.h
+2 −2 fsw/cfe-core/src/inc/cfe_tbl.h
+1 −1 fsw/cfe-core/src/inc/cfe_tbl_extern_typedefs.h
+2 −2 fsw/cfe-core/src/inc/cfe_tbl_filedef.h
+23 −23 fsw/cfe-core/src/inc/cfe_tbl_msg.h
+3 −3 fsw/cfe-core/src/inc/cfe_time.h
+22 −22 fsw/cfe-core/src/inc/cfe_time_msg.h
+1 −1 fsw/cfe-core/src/inc/cfe_version.h
+30 −29 fsw/cfe-core/src/sb/cfe_sb_api.c
+3 −3 fsw/cfe-core/src/sb/cfe_sb_priv.h
+45 −39 fsw/cfe-core/src/sb/cfe_sb_task.c
+7 −5 fsw/cfe-core/src/tbl/cfe_tbl_internal.c
+1 −1 fsw/cfe-core/src/tbl/cfe_tbl_internal.h
+2 −2 fsw/cfe-core/src/tbl/cfe_tbl_task.h
+29 −21 fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c
+2 −2 fsw/cfe-core/src/time/cfe_time_task.c
+1 −1 fsw/cfe-core/src/time/cfe_time_tone.c
+3 −3 fsw/cfe-core/src/time/cfe_time_utils.h
+17 −29 fsw/cfe-core/unit-test/es_UT.c
+3 −3 fsw/cfe-core/unit-test/fs_UT.c
+8 −2 fsw/cfe-core/unit-test/sb_UT.c
+2 −1 fsw/cfe-core/unit-test/tbl_UT.c
+1 −1 fsw/cfe-core/unit-test/time_UT.c
+7 −0 fsw/cfe-core/ut-stubs/ut_evs_stubs.c
+3 −3 fsw/cfe-core/ut-stubs/ut_fs_stubs.c
2 changes: 1 addition & 1 deletion osal
Open in desktop
Submodule osal updated 6 files
+6 −8 README.md
+39 −0 src/os/inc/osapi-os-core.h
+1 −1 src/os/inc/osapi-version.h
+0 −9 src/os/shared/inc/os-shared-idmap.h
+51 −52 src/os/shared/src/osapi-idmap.c
+1 −1 src/unit-test-coverage/ut-stubs/inc/OCS_sys_types.h
2 changes: 1 addition & 1 deletion tools/cFS-GroundSystem
Open in desktop
Submodule cFS-GroundSystem updated 3 files
+5 −0 README.md
+257 −232 Subsystems/cmdGui/CHeaderParser.py
+1 −1 _version.py