Skip to content

Commit

Permalink
Integration Candidate 2021-02-02
Browse files Browse the repository at this point in the history
Combines

nasa/cFE#1150
nasa/osal#774
nasa/PSP#250
nasa/to_lab#84
nasa/tblCRCTool#35

Also adds minor white-space fix in codeql-build.yml
  • Loading branch information
astrogeco committed Feb 16, 2021
1 parent 37b1719 commit a41549c
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ jobs:
- name: Make Install
run: make

# Run CodeQL
# Run CodeQL
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
2 changes: 1 addition & 1 deletion apps/ci_lab
2 changes: 1 addition & 1 deletion apps/sch_lab
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 99 files
+56 −0 .github/workflows/codeql-build.yml
+1 −0 .github/workflows/static-analysis.yml
+29 −1 README.md
+1 −1 cmake/arch_build.cmake
+1 −0 cmake/mission_defaults.cmake
+16 −50 cmake/sample_defs/cpu1_platform_cfg.h
+15 −9 docs/src/cfe_es.dox
+7 −10 docs/src/cfe_sb.dox
+2 −36 docs/src/cfe_tbl.dox
+107 −95 fsw/cfe-core/src/es/cfe_es_api.c
+64 −76 fsw/cfe-core/src/es/cfe_es_apps.c
+12 −23 fsw/cfe-core/src/es/cfe_es_apps.h
+1 −1 fsw/cfe-core/src/es/cfe_es_backgroundtask.c
+17 −17 fsw/cfe-core/src/es/cfe_es_cds.c
+16 −16 fsw/cfe-core/src/es/cfe_es_cds.h
+3 −3 fsw/cfe-core/src/es/cfe_es_erlog.c
+6 −6 fsw/cfe-core/src/es/cfe_es_global.h
+1 −1 fsw/cfe-core/src/es/cfe_es_log.h
+18 −18 fsw/cfe-core/src/es/cfe_es_mempool.c
+9 −9 fsw/cfe-core/src/es/cfe_es_mempool.h
+0 −13 fsw/cfe-core/src/es/cfe_es_objtab.c
+28 −83 fsw/cfe-core/src/es/cfe_es_resource.c
+95 −42 fsw/cfe-core/src/es/cfe_es_resource.h
+10 −10 fsw/cfe-core/src/es/cfe_es_start.c
+22 −19 fsw/cfe-core/src/es/cfe_es_task.c
+0 −3 fsw/cfe-core/src/es/cfe_es_task.h
+10 −8 fsw/cfe-core/src/evs/cfe_evs.c
+39 −39 fsw/cfe-core/src/evs/cfe_evs_log.c
+65 −75 fsw/cfe-core/src/evs/cfe_evs_task.c
+5 −6 fsw/cfe-core/src/evs/cfe_evs_task.h
+19 −19 fsw/cfe-core/src/evs/cfe_evs_utils.c
+9 −9 fsw/cfe-core/src/evs/cfe_evs_utils.h
+2 −2 fsw/cfe-core/src/fs/cfe_fs_api.c
+10 −8 fsw/cfe-core/src/fs/cfe_fs_priv.c
+2 −2 fsw/cfe-core/src/fs/cfe_fs_priv.h
+84 −39 fsw/cfe-core/src/inc/cfe_es.h
+24 −13 fsw/cfe-core/src/inc/cfe_es_extern_typedefs.h
+19 −10 fsw/cfe-core/src/inc/cfe_es_msg.h
+2 −2 fsw/cfe-core/src/inc/cfe_evs.h
+12 −18 fsw/cfe-core/src/inc/cfe_evs_events.h
+1 −1 fsw/cfe-core/src/inc/cfe_evs_msg.h
+3 −3 fsw/cfe-core/src/inc/cfe_fs_extern_typedefs.h
+0 −150 fsw/cfe-core/src/inc/cfe_resourceid.h
+257 −0 fsw/cfe-core/src/inc/cfe_resourceid_api.h
+14 −13 fsw/cfe-core/src/inc/cfe_sb.h
+1 −1 fsw/cfe-core/src/inc/cfe_sb_events.h
+9 −0 fsw/cfe-core/src/inc/cfe_sb_extern_typedefs.h
+16 −29 fsw/cfe-core/src/inc/cfe_sb_msg.h
+1 −1 fsw/cfe-core/src/inc/cfe_version.h
+97 −0 fsw/cfe-core/src/inc/private/cfe_core_resourceid_basevalues.h
+1 −1 fsw/cfe-core/src/inc/private/cfe_es_erlog_typedef.h
+1 −3 fsw/cfe-core/src/inc/private/cfe_es_resetdata_typedef.h
+5 −5 fsw/cfe-core/src/inc/private/cfe_private.h
+0 −165 fsw/cfe-core/src/inc/private/cfe_resourceid_internal.h
+174 −173 fsw/cfe-core/src/sb/cfe_sb_api.c
+16 −16 fsw/cfe-core/src/sb/cfe_sb_buf.c
+12 −14 fsw/cfe-core/src/sb/cfe_sb_init.c
+23 −23 fsw/cfe-core/src/sb/cfe_sb_priv.c
+30 −33 fsw/cfe-core/src/sb/cfe_sb_priv.h
+167 −202 fsw/cfe-core/src/sb/cfe_sb_task.c
+2 −6 fsw/cfe-core/src/sb/cfe_sb_verify.h
+99 −99 fsw/cfe-core/src/tbl/cfe_tbl_api.c
+113 −182 fsw/cfe-core/src/tbl/cfe_tbl_internal.c
+6 −6 fsw/cfe-core/src/tbl/cfe_tbl_internal.h
+18 −18 fsw/cfe-core/src/tbl/cfe_tbl_task.c
+4 −4 fsw/cfe-core/src/tbl/cfe_tbl_task.h
+112 −112 fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c
+2 −2 fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.h
+15 −15 fsw/cfe-core/src/time/cfe_time_api.c
+68 −68 fsw/cfe-core/src/time/cfe_time_task.c
+139 −139 fsw/cfe-core/src/time/cfe_time_tone.c
+119 −175 fsw/cfe-core/src/time/cfe_time_utils.c
+7 −7 fsw/cfe-core/src/time/cfe_time_utils.h
+324 −252 fsw/cfe-core/unit-test/es_UT.c
+49 −49 fsw/cfe-core/unit-test/evs_UT.c
+187 −192 fsw/cfe-core/unit-test/sb_UT.c
+0 −16 fsw/cfe-core/unit-test/sb_UT.h
+393 −392 fsw/cfe-core/unit-test/tbl_UT.c
+410 −410 fsw/cfe-core/unit-test/time_UT.c
+8 −12 fsw/cfe-core/unit-test/ut_support.c
+1 −1 fsw/cfe-core/unit-test/ut_support.h
+1 −0 fsw/cfe-core/ut-stubs/CMakeLists.txt
+32 −77 fsw/cfe-core/ut-stubs/ut_es_stubs.c
+3 −3 fsw/cfe-core/ut-stubs/ut_evs_stubs.c
+121 −0 fsw/cfe-core/ut-stubs/ut_resourceid_stubs.c
+1 −11 fsw/cfe-core/ut-stubs/ut_sb_stubs.c
+1 −1 fsw/cfe-core/ut-stubs/ut_tbl_stubs.c
+1 −1 fsw/cfe-core/ut-stubs/ut_time_stubs.c
+1 −1 modules/cfe_testcase/src/es_test.c
+18 −0 modules/resourceid/CMakeLists.txt
+13 −0 modules/resourceid/arch_build.cmake
+32 −0 modules/resourceid/mission_build.cmake
+79 −0 modules/resourceid/option/cfe_resourceid_osal_compatible.h
+64 −0 modules/resourceid/option/cfe_resourceid_simple.h
+87 −0 modules/resourceid/option/cfe_resourceid_strict.h
+134 −0 modules/resourceid/src/cfe_resourceid_api.c
+29 −0 modules/resourceid/unit-test-coverage/CMakeLists.txt
+181 −0 modules/resourceid/unit-test-coverage/test_cfe_resourceid.c
+11 −22 modules/sbr/src/cfe_sbr_route_unsorted.c
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 392 files
2 changes: 1 addition & 1 deletion psp
Submodule psp updated 129 files

0 comments on commit a41549c

Please sign in to comment.