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

cFS-bundle Integration Candidate: 2021-08-17 #337

Merged
merged 3 commits into from
Aug 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 10 additions & 10 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,36 @@
[submodule "psp"]
path = psp
url = https://github.com/nasa/PSP.git
branch = master
branch = main
[submodule "apps/ci_lab"]
path = apps/ci_lab
url = https://github.com/nasa/ci_lab.git
branch = master
branch = main
[submodule "apps/sample_app"]
path = apps/sample_app
url = https://github.com/nasa/sample_app.git
branch = master
branch = main
[submodule "apps/sample_lib"]
path = apps/sample_lib
path = libs/sample_lib
url = https://github.com/nasa/sample_lib.git
branch = master
branch = main
[submodule "apps/sch_lab"]
path = apps/sch_lab
url = https://github.com/nasa/sch_lab.git
branch = master
branch = main
[submodule "apps/to_lab"]
path = apps/to_lab
url = https://github.com/nasa/to_lab.git
branch = master
branch = main
[submodule "tools/cFS-GroundSystem"]
path = tools/cFS-GroundSystem
url = https://github.com/nasa/cFS-GroundSystem.git
branch = master
branch = main
[submodule "tools/elf2cfetbl"]
path = tools/elf2cfetbl
url = https://github.com/nasa/elf2cfetbl.git
branch = master
branch = main
[submodule "tools/tblCRCTool"]
path = tools/tblCRCTool
url = https://github.com/nasa/tblCRCTool.git
branch = master
branch = main
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 36 files
+4 −1 .github/workflows/functional-tests.yml
+15 −0 README.md
+131 −0 modules/cfe_assert/inc/cfe_assert.h
+20 −0 modules/cfe_assert/src/cfe_assert_runner.c
+4 −0 modules/cfe_testcase/CMakeLists.txt
+5 −1 modules/cfe_testcase/src/cfe_test.c
+9 −1 modules/cfe_testcase/src/cfe_test.h
+93 −0 modules/cfe_testcase/src/es_behavior_test.c
+8 −6 modules/cfe_testcase/src/es_cds_test.c
+1 −1 modules/cfe_testcase/src/es_counter_test.c
+6 −6 modules/cfe_testcase/src/es_info_test.c
+2 −0 modules/cfe_testcase/src/es_mempool_test.c
+74 −0 modules/cfe_testcase/src/es_perf_test.c
+7 −0 modules/cfe_testcase/src/es_resource_id_test.c
+2 −2 modules/cfe_testcase/src/es_task_test.c
+3 −3 modules/cfe_testcase/src/fs_header_test.c
+238 −0 modules/cfe_testcase/src/msg_api_test.c
+1 −1 modules/cfe_testcase/src/sb_pipe_mang_test.c
+104 −0 modules/cfe_testcase/src/time_external_test.c
+116 −72 modules/core_api/fsw/inc/cfe_es.h
+8 −3 modules/core_api/fsw/inc/cfe_evs.h
+38 −18 modules/core_api/fsw/inc/cfe_fs.h
+50 −50 modules/core_api/fsw/inc/cfe_msg.h
+5 −1 modules/core_api/fsw/inc/cfe_resourceid.h
+23 −21 modules/core_api/fsw/inc/cfe_sb.h
+30 −14 modules/core_api/fsw/inc/cfe_tbl.h
+7 −1 modules/core_api/fsw/inc/cfe_time.h
+1 −1 modules/core_api/fsw/inc/cfe_version.h
+2 −2 modules/core_api/ut-stubs/src/cfe_es_stubs.c
+2 −2 modules/core_api/ut-stubs/src/cfe_sb_stubs.c
+10 −1 modules/core_private/ut-stubs/inc/ut_osprintf_stubs.h
+9 −0 modules/core_private/ut-stubs/src/ut_osprintf_stubs.c
+69 −57 modules/es/fsw/src/cfe_es_api.c
+30 −0 modules/es/ut-coverage/es_UT.c
+2 −2 modules/sb/fsw/src/cfe_sb_api.c
+1 −1 modules/sb/fsw/src/cfe_sb_priv.h