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

cFS Integration Candidate: 2020-11-24 #158

Merged
merged 45 commits into from
Dec 3, 2020
Merged

cFS Integration Candidate: 2020-11-24 #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
b0d15cc
Add nasa/cfe#984
astrogeco Nov 10, 2020
8a2c6f6
Add nasa/cfe#980
astrogeco Nov 10, 2020
6710e6e
Add nasa/cfe#867
astrogeco Nov 10, 2020
2a7d619
Add nasa/osal#638 and update cfe due to rebase
astrogeco Nov 10, 2020
5e33e4e
Add nasa/cfe#987
astrogeco Nov 10, 2020
124acaf
Add nasa/to_lab#64 and nasa/sample_app#104
astrogeco Nov 10, 2020
5cf4fe9
Add nasa/osal#643
astrogeco Nov 10, 2020
fbf96bd
Add nasa/cfe#1000
astrogeco Nov 12, 2020
a31a25f
Add nasa/ci_lab#58
astrogeco Nov 12, 2020
3cfd411
Add doxygen fixes for nasa/osal#643
jphickey Nov 12, 2020
97acae0
Add nasa/cfe#1013
astrogeco Nov 13, 2020
d05d482
Add nasa/cfe#1011
astrogeco Nov 13, 2020
a18c8df
Add nasa/ci_lab#61
astrogeco Nov 13, 2020
c56b147
Add nasa/sample_app#109
astrogeco Nov 13, 2020
e58b620
Bump versions and point to submodules main
astrogeco Nov 16, 2020
a47d6ab
Add nasa/osal#654
astrogeco Nov 21, 2020
6e0ce98
Add nasa/cfe#1003
astrogeco Nov 21, 2020
374c290
Add nasa/psp#219
astrogeco Nov 23, 2020
b191aa4
Try to add nasa/cfe#1028
astrogeco Nov 23, 2020
b5101ef
Add nasa/cfe#1028
astrogeco Nov 23, 2020
5e91719
Add Doxygen Hotfix for cfe
astrogeco Dec 1, 2020
34e9b9c
Add nasa/osal#646
astrogeco Dec 1, 2020
b1dc99e
Add nasa/psp#215
astrogeco Dec 1, 2020
f15585a
Add nasa/sch_lab#55
astrogeco Dec 1, 2020
a2486ba
Add nasa/cfe#1007
astrogeco Dec 1, 2020
8aea740
Add osal hotfix to astrogeco IC
astrogeco Dec 1, 2020
2138fe7
Add nasa/sample_lib#37
astrogeco Dec 1, 2020
1717031
Add cfe and osal hotfixes
astrogeco Dec 1, 2020
2ff085c
Add nasa/sample_app #107
astrogeco Dec 1, 2020
181d221
Add nasa/cfe#1018
astrogeco Dec 1, 2020
4f48d46
Add nasa/osal#656
astrogeco Dec 1, 2020
0cc8652
Add nasa/osal#658
astrogeco Dec 1, 2020
c715229
Add nasa/cfe#1024
astrogeco Dec 1, 2020
3a7c68e
Add nasa/ci_lab#63
astrogeco Dec 1, 2020
0791fdc
Add nasa/tblCRCTool#23
astrogeco Dec 1, 2020
918dc3c
revert ci_lab#63 from bundle IC
astrogeco Dec 1, 2020
14cfdab
Add cfe#1022
astrogeco Dec 1, 2020
2cb78e1
Add nasa/osal#653
astrogeco Dec 1, 2020
26d6230
Add cfe#1017
astrogeco Dec 1, 2020
f9a803d
Add Hotfix for userguide doxygen error
astrogeco Dec 1, 2020
3c81543
Merge branch 'main' into integration-candidate
astrogeco Dec 2, 2020
d6dbcad
Update sample_lib to reflect rebase
astrogeco Dec 2, 2020
d1ee95d
Bump submodules to main for IC 2020-11-24
astrogeco Dec 2, 2020
f970e5d
Add version HOTFIX to tblCRCTool
astrogeco Dec 2, 2020
5bb9f4f
Bump tblCRCtool to main
astrogeco Dec 3, 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 3 files
+6 −0 README.md
+1 −1 fsw/src/sample_app_version.h
+3 −3 unit-test/coveragetest/coveragetest_sample_app.c
2 changes: 1 addition & 1 deletion apps/sample_lib
Open in desktop
Submodule sample_lib updated 3 files
+5 −0 README.md
+1 −1 fsw/src/sample_lib_version.h
+1 −1 unit-test/coveragetest/coveragetest_sample_lib.c
2 changes: 1 addition & 1 deletion apps/sch_lab
Open in desktop
Submodule sch_lab updated 3 files
+5 −0 README.md
+7 −14 fsw/src/sch_lab_app.c
+1 −1 fsw/src/sch_lab_version.h
2 changes: 1 addition & 1 deletion cfe
Open in desktop
Submodule cfe updated 73 files
+11 −0 README.md
+71 −67 docs/cFE Application Developers Guide.md
+13 −12 docs/src/cfe_api.dox
+1 −1 docs/src/cfe_sb.dox
+27 −22 fsw/cfe-core/src/es/cfe_es_api.c
+43 −23 fsw/cfe-core/src/es/cfe_es_apps.c
+5 −5 fsw/cfe-core/src/es/cfe_es_apps.h
+1 −1 fsw/cfe-core/src/es/cfe_es_backgroundtask.c
+18 −17 fsw/cfe-core/src/es/cfe_es_cds.c
+16 −13 fsw/cfe-core/src/es/cfe_es_cds.h
+22 −24 fsw/cfe-core/src/es/cfe_es_cds_mempool.c
+3 −4 fsw/cfe-core/src/es/cfe_es_cds_mempool.h
+29 −29 fsw/cfe-core/src/es/cfe_es_generic_pool.c
+33 −24 fsw/cfe-core/src/es/cfe_es_generic_pool.h
+16 −23 fsw/cfe-core/src/es/cfe_es_mempool.c
+3 −2 fsw/cfe-core/src/es/cfe_es_perf.c
+1 −1 fsw/cfe-core/src/es/cfe_es_perf.h
+131 −116 fsw/cfe-core/src/es/cfe_es_task.c
+5 −5 fsw/cfe-core/src/es/cfe_es_task.h
+1 −1 fsw/cfe-core/src/evs/cfe_evs_log.c
+101 −83 fsw/cfe-core/src/evs/cfe_evs_task.c
+1 −1 fsw/cfe-core/src/evs/cfe_evs_task.h
+10 −10 fsw/cfe-core/src/evs/cfe_evs_utils.c
+1 −1 fsw/cfe-core/src/inc/cfe_error.h
+41 −18 fsw/cfe-core/src/inc/cfe_es.h
+0 −17 fsw/cfe-core/src/inc/cfe_es_events.h
+27 −19 fsw/cfe-core/src/inc/cfe_es_extern_typedefs.h
+15 −17 fsw/cfe-core/src/inc/cfe_es_msg.h
+3 −3 fsw/cfe-core/src/inc/cfe_evs_msg.h
+91 −122 fsw/cfe-core/src/inc/cfe_sb.h
+2 −2 fsw/cfe-core/src/inc/cfe_sb_events.h
+4 −3 fsw/cfe-core/src/inc/cfe_tbl.h
+3 −2 fsw/cfe-core/src/inc/cfe_tbl_extern_typedefs.h
+8 −8 fsw/cfe-core/src/inc/cfe_tbl_msg.h
+3 −3 fsw/cfe-core/src/inc/cfe_time_msg.h
+1 −1 fsw/cfe-core/src/inc/cfe_version.h
+1 −1 fsw/cfe-core/src/inc/private/cfe_private.h
+30 −28 fsw/cfe-core/src/sb/cfe_sb_api.c
+1 −1 fsw/cfe-core/src/sb/cfe_sb_buf.c
+4 −5 fsw/cfe-core/src/sb/cfe_sb_init.c
+4 −2 fsw/cfe-core/src/sb/cfe_sb_msg_id_util.c
+4 −3 fsw/cfe-core/src/sb/cfe_sb_priv.c
+8 −11 fsw/cfe-core/src/sb/cfe_sb_priv.h
+40 −38 fsw/cfe-core/src/sb/cfe_sb_task.c
+32 −32 fsw/cfe-core/src/sb/cfe_sb_util.c
+11 −11 fsw/cfe-core/src/tbl/cfe_tbl_api.c
+14 −14 fsw/cfe-core/src/tbl/cfe_tbl_internal.c
+20 −19 fsw/cfe-core/src/tbl/cfe_tbl_task.c
+6 −6 fsw/cfe-core/src/tbl/cfe_tbl_task.h
+27 −27 fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c
+3 −3 fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.h
+59 −54 fsw/cfe-core/src/time/cfe_time_task.c
+7 −7 fsw/cfe-core/src/time/cfe_time_tone.c
+17 −17 fsw/cfe-core/src/time/cfe_time_utils.c
+4 −4 fsw/cfe-core/src/time/cfe_time_utils.h
+119 −133 fsw/cfe-core/unit-test/es_UT.c
+70 −54 fsw/cfe-core/unit-test/evs_UT.c
+6 −6 fsw/cfe-core/unit-test/fs_UT.c
+202 −330 fsw/cfe-core/unit-test/sb_UT.c
+1 −863 fsw/cfe-core/unit-test/sb_UT.h
+67 −251 fsw/cfe-core/unit-test/tbl_UT.c
+0 −146 fsw/cfe-core/unit-test/tbl_UT.h
+12 −8 fsw/cfe-core/unit-test/time_UT.c
+25 −24 fsw/cfe-core/unit-test/ut_support.c
+3 −6 fsw/cfe-core/unit-test/ut_support.h
+33 −40 fsw/cfe-core/ut-stubs/ut_es_stubs.c
+1 −1 fsw/cfe-core/ut-stubs/ut_evs_stubs.c
+49 −37 fsw/cfe-core/ut-stubs/ut_sb_stubs.c
+2 −2 fsw/cfe-core/ut-stubs/ut_tbl_stubs.c
+1 −1 fsw/cfe-core/ut-stubs/ut_time_stubs.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 −2 modules/sbr/unit-test-coverage/test_cfe_sbr_route_unsorted.c
2 changes: 1 addition & 1 deletion osal
Open in desktop
Submodule osal updated 227 files
2 changes: 1 addition & 1 deletion psp
Open in desktop
Submodule psp updated 8 files
+6 −0 README.md
+1 −1 fsw/mcp750-vxworks/inc/psp_version.h
+1 −1 fsw/pc-linux/inc/psp_version.h
+1 −1 fsw/pc-rtems/inc/psp_version.h
+2 −2 unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c
+1 −1 unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c
+2 −2 unit-test-coverage/ut-stubs/src/libc-stdlib-stubs.c
+27 −13 ut-stubs/ut_psp_stubs.c
2 changes: 1 addition & 1 deletion tools/tblCRCTool
Open in desktop
Submodule tblCRCTool updated 3 files
+7 −0 README.md
+9 −8 cfe_ts_crc.c
+4 −3 cfe_ts_crc_version.h