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

Integration Candidate: 2020-06-10 #102

Merged
merged 3 commits into from
Jun 18, 2020
Merged

Integration Candidate: 2020-06-10 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26c0613
Added a reference to the skeleton_app in README.md
Jun 15, 2020
a9c6c6e
Update submodules to master for IC-20200610
Jun 17, 2020
f5156de
Update to osal master to include FastTracked nasa/osal#503 and nasa/o…
Jun 17, 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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ The following list is user submitted, and not CCB controlled. They are released
- SCA: Stored Command Absolute application at https://github.com/nasa/SCA
- SCH: Scheduler application at https://github.com/nasa/SCH
- TO: Telemetry Output application at https://github.com/nasa/CFS_TO
- Skeleton App: A bare-bones application to which you can add your business logic at https://github.com/nasa/skeleton_app
- Other Interfaces
- SIL: Simulink Interface Layer at https://github.com/nasa/SIL
- ECI: External Code Interface at https://github.com/nasa/ECI
Expand Down
2 changes: 1 addition & 1 deletion apps/sample_app
Open in desktop
Submodule sample_app updated 9 files
+1 −2 CMakeLists.txt
+6 −0 README.md
+6 −6 fsw/platform_inc/sample_app_table.h
+11 −12 fsw/src/sample_app.c
+3 −3 fsw/src/sample_app.h
+1 −1 fsw/src/sample_app_version.h
+4 −3 fsw/tables/sample_app_tbl.c
+5 −5 unit-test/coveragetest/coveragetest_sample_app.c
+1 −1 unit-test/coveragetest/sample_app_coveragetest_common.h
2 changes: 1 addition & 1 deletion apps/to_lab
Open in desktop
Submodule to_lab updated 8 files
+2 −0 CMakeLists.txt
+7 −0 README.md
+17 −62 fsw/platform_inc/to_lab_sub_table.h
+47 −21 fsw/src/to_lab_app.c
+1 −0 fsw/src/to_lab_app.h
+1 −0 fsw/src/to_lab_events.h
+1 −1 fsw/src/to_lab_version.h
+93 −0 fsw/tables/to_lab_sub.c
2 changes: 1 addition & 1 deletion cfe
Open in desktop
Submodule cfe updated 7 files
+5 −0 README.md
+1 −1 docs/cFE Application Developers Guide.md
+1 −1 fsw/cfe-core/src/inc/cfe_version.h
+501 −1,687 fsw/cfe-core/unit-test/sb_UT.c
+68 −11 fsw/cfe-core/unit-test/sb_UT.h
+69 −112 fsw/cfe-core/unit-test/ut_support.c
+23 −117 fsw/cfe-core/unit-test/ut_support.h
2 changes: 1 addition & 1 deletion osal
Open in desktop
Submodule osal updated 14 files
+17 −0 README.md
+5 −5 src/os/inc/osapi-os-core.h
+2 −2 src/os/inc/osapi-os-filesys.h
+1 −1 src/os/inc/osapi-os-loader.h
+1 −1 src/os/inc/osapi-os-net.h
+3 −3 src/os/inc/osapi-os-timer.h
+1 −1 src/os/inc/osapi-version.h
+21 −0 src/ut-stubs/osapi-utstub-file.c
+27 −0 src/ut-stubs/osapi-utstub-filesys.c
+11 −0 src/ut-stubs/osapi-utstub-printf.c
+28 −1 src/ut-stubs/osapi-utstub-task.c
+78 −0 ut_assert/inc/utassert.h
+1 −1 ut_assert/src/utassert.c
+1 −1 ut_assert/src/utstubs.c
2 changes: 1 addition & 1 deletion psp
Open in desktop
Submodule psp updated 5 files
+5 −0 README.md
+1 −1 fsw/mcp750-vxworks/inc/psp_version.h
+6 −0 fsw/mcp750-vxworks/src/cfe_psp_exception.c
+1 −1 fsw/pc-linux/inc/psp_version.h
+1 −1 fsw/pc-rtems/inc/psp_version.h