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-11-03 #154

Merged
merged 13 commits into from
Nov 4, 2020
Merged

Integration Candidate: 2020-11-03 #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5911269
Add nasa/osal#634
astrogeco Oct 30, 2020
7472a89
Add nasa/psp#212
astrogeco Oct 30, 2020
72e944f
Add nasa/cfe#977
astrogeco Oct 30, 2020
72a534d
Add nasa/cfe#964
astrogeco Oct 30, 2020
b334de7
Add HOTFIX for cFE doxygen problem
astrogeco Nov 2, 2020
bcfaacb
Add nasa/osal#633
astrogeco Nov 2, 2020
b01499a
Add samle_lib and sample_app name changes
astrogeco Nov 2, 2020
b921f80
Add nasa/cfe#971
astrogeco Nov 2, 2020
c68ee73
Add nasa/cfe#990
astrogeco Nov 3, 2020
4acb322
Add nasa/osal#629
astrogeco Nov 3, 2020
1fc7f8d
Add HOTFIX for PSP for variable declaration
jphickey Nov 3, 2020
de6d18b
Add merge prep version bump and readme commits
astrogeco Nov 4, 2020
094dcd6
Point submodules to main for IC-20201103
astrogeco Nov 4, 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 apps/sample_app
Open in desktop
Submodule sample_app updated 8 files
+7 −1 README.md
+102 −100 fsw/src/sample_app.c
+24 −24 fsw/src/sample_app.h
+9 −9 fsw/src/sample_app_events.h
+8 −8 fsw/src/sample_app_msg.h
+5 −5 fsw/src/sample_app_version.h
+110 −108 unit-test/coveragetest/coveragetest_sample_app.c
+3 −3 unit-test/inc/ut_sample_app.h
2 changes: 1 addition & 1 deletion apps/sample_lib
Open in desktop
Submodule sample_lib updated 7 files
+8 −2 README.md
+2 −2 fsw/public_inc/sample_lib.h
+8 −8 fsw/src/sample_lib.c
+2 −2 fsw/src/sample_lib_internal.h
+21 −18 fsw/src/sample_lib_version.h
+14 −14 unit-test/coveragetest/coveragetest_sample_lib.c
+6 −6 ut-stubs/sample_lib_stubs.c
2 changes: 1 addition & 1 deletion cfe
Open in desktop
Submodule cfe updated 19 files
+11 −0 README.md
+2 −2 cmake/sample_defs/cpu1_cfe_es_startup.scr
+22 −1 cmake/sample_defs/sample_mission_cfg.h
+1 −1 docs/src/cfe_es.dox
+4 −2 fsw/cfe-core/src/es/cfe_es_api.c
+2 −2 fsw/cfe-core/src/es/cfe_es_backgroundtask.c
+1 −1 fsw/cfe-core/src/es/cfe_es_cds.h
+6 −6 fsw/cfe-core/src/es/cfe_es_mempool.c
+3 −6 fsw/cfe-core/src/es/cfe_es_task.c
+2 −2 fsw/cfe-core/src/es/cfe_es_verify.h
+56 −214 fsw/cfe-core/src/inc/cfe_es.h
+87 −0 fsw/cfe-core/src/inc/cfe_es_extern_typedefs.h
+143 −3 fsw/cfe-core/src/inc/cfe_es_msg.h
+2 −2 fsw/cfe-core/src/inc/cfe_version.h
+1 −1 fsw/cfe-core/src/sb/cfe_sb_api.c
+2 −2 fsw/cfe-core/src/sb/cfe_sb_init.c
+6 −6 fsw/cfe-core/unit-test/es_UT.c
+1 −1 modules/sbr/unit-test-coverage/test_cfe_sbr_map_direct.c
+1 −1 modules/sbr/unit-test-coverage/test_cfe_sbr_map_hash.c
2 changes: 1 addition & 1 deletion osal
Open in desktop
Submodule osal updated 15 files
+12 −0 README.md
+1 −1 src/os/inc/osapi-os-filesys.h
+3 −4 src/os/inc/osapi-version.h
+1 −0 src/os/portable/os-impl-bsd-sockets.c
+12 −2 src/os/portable/os-impl-posix-files.c
+2 −1 src/os/shared/inc/os-shared-mutex.h
+7 −3 src/os/shared/src/osapi-filesys.c
+28 −0 src/os/shared/src/osapi-mutex.c
+0 −1 src/os/shared/src/osapi-select.c
+13 −8 src/unit-test-coverage/portable/src/coveragetest-posix-files.c
+1 −0 src/unit-test-coverage/ut-stubs/inc/OCS_stat.h
+1 −0 src/unit-test-coverage/ut-stubs/override_inc/stat.h
+14 −0 src/unit-test-coverage/ut-stubs/src/posix-stat-stubs.c
+1 −1 src/unit-tests/oscore-test/ut_oscore_countsem_test.c
+20 −19 ut_assert/inc/utassert.h
2 changes: 1 addition & 1 deletion psp
Open in desktop
Submodule psp updated 6 files
+6 −0 README.md
+2 −2 fsw/mcp750-vxworks/inc/psp_version.h
+6 −0 fsw/pc-linux/CMakeLists.txt
+2 −2 fsw/pc-linux/inc/psp_version.h
+58 −0 fsw/pc-linux/src/cfe_psp_start.c
+17 −16 fsw/pc-rtems/inc/psp_version.h