Skip to content

Commit

Permalink
cFS Bundle Integration Candidate: 2021-04-06
Browse files Browse the repository at this point in the history 
Combines:

nasa/cFE#1284
nasa/osal#951
nasa/PSP#289

Including:

nasa/cFE#1251 - ES Info API Functional test

nasa/osal#931 - Scrub include guards
nasa/osal#937 - Switch to use CLOCK_REALTIME
nasa/osal#938 - specify shell name in ShellOutputToFile

nasa/PSP#286 - use OSAL timebase for CFE timers
nasa/PSP#282 - modularize the ram, port, and eenasa/psp#om access
nasa/PSP#285 - add psp module to implement timebase
  • Loading branch information
@astrogeco
astrogeco committed Apr 8, 2021
1 parent fd2ef69 commit 13e2add
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 7 files
+5 −0 README.md
+2 −1 modules/cfe_testcase/CMakeLists.txt
+1 −1 modules/cfe_testcase/src/cfe_test.c
+10 −1 modules/cfe_testcase/src/cfe_test.h
+269 −0 modules/cfe_testcase/src/es_info_test.c
+0 −44 modules/cfe_testcase/src/es_test.c
+1 −1 modules/core_api/fsw/inc/cfe_version.h
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 321 files
2 changes: 1 addition & 1 deletion psp
Submodule psp updated 47 files
+5 −2 CMakeLists.txt
+11 −0 README.md
+50 −6 fsw/inc/cfe_psp.h
+0 −1 fsw/mcp750-vxworks/CMakeLists.txt
+27 −0 fsw/mcp750-vxworks/inc/cfe_psp_config.h
+1 −1 fsw/mcp750-vxworks/inc/psp_version.h
+5 −1 fsw/mcp750-vxworks/psp_module_list.cmake
+6 −28 fsw/mcp750-vxworks/src/cfe_psp_start.c
+0 −229 fsw/mcp750-vxworks/src/cfe_psp_timer.c
+3 −0 fsw/modules/eeprom_notimpl/CMakeLists.txt
+7 −7 fsw/modules/eeprom_notimpl/cfe_psp_eeprom_notimpl.c
+0 −3 fsw/modules/eeprom_stub/CMakeLists.txt
+3 −0 fsw/modules/port_direct/CMakeLists.txt
+15 −17 fsw/modules/port_direct/cfe_psp_port_direct.c
+3 −0 fsw/modules/port_notimpl/CMakeLists.txt
+69 −0 fsw/modules/port_notimpl/cfe_psp_port_notimpl.c
+3 −0 fsw/modules/ram_direct/CMakeLists.txt
+15 −17 fsw/modules/ram_direct/cfe_psp_ram_direct.c
+3 −0 fsw/modules/ram_notimpl/CMakeLists.txt
+69 −0 fsw/modules/ram_notimpl/cfe_psp_ram_notimpl.c
+3 −0 fsw/modules/soft_timebase/CMakeLists.txt
+82 −0 fsw/modules/soft_timebase/cfe_psp_soft_timebase.c
+3 −0 fsw/modules/timebase_posix_clock/CMakeLists.txt
+161 −0 fsw/modules/timebase_posix_clock/cfe_psp_timebase_posix_clock.c
+3 −0 fsw/modules/timebase_vxworks/CMakeLists.txt
+250 −0 fsw/modules/timebase_vxworks/cfe_psp_timebase_vxworks.c
+2 −2 fsw/pc-linux/CMakeLists.txt
+13 −0 fsw/pc-linux/inc/cfe_psp_config.h
+1 −1 fsw/pc-linux/inc/psp_version.h
+5 −1 fsw/pc-linux/psp_module_list.cmake
+0 −142 fsw/pc-linux/src/cfe_psp_start.c
+0 −192 fsw/pc-linux/src/cfe_psp_timer.c
+0 −1 fsw/pc-rtems/CMakeLists.txt
+13 −0 fsw/pc-rtems/inc/cfe_psp_config.h
+1 −1 fsw/pc-rtems/inc/psp_version.h
+6 −2 fsw/pc-rtems/psp_module_list.cmake
+0 −48 fsw/pc-rtems/src/cfe_psp_start.c
+0 −188 fsw/pc-rtems/src/cfe_psp_timer.c
+0 −3 fsw/shared/CMakeLists.txt
+1 −0 unit-test-coverage/CMakeLists.txt
+67 −0 unit-test-coverage/modules/CMakeLists.txt
+35 −0 unit-test-coverage/modules/inc/cfe_psp_config.h
+29 −0 unit-test-coverage/modules/inc/coveragetest-timebase_vxworks.h
+224 −0 unit-test-coverage/modules/src/coveragetest-timebase_vxworks.c
+19 −0 unit-test-coverage/ut-stubs/inc/PCS_time.h
+17 −0 unit-test-coverage/ut-stubs/override_inc/time.h
+3 −1 unit-test-coverage/ut-stubs/src/vxworks-vxLib-stubs.c

0 comments on commit 13e2add

Please sign in to comment.