Skip to content

Commit

Permalink
Merge pull request nasa#597 from nasa/integration-candidate
Browse files Browse the repository at this point in the history
IC: Caelum-rc4+dev26
  • Loading branch information
dzbaker authored Oct 17, 2022
2 parents 57168f4 + 3c5b7ce commit 35548bc
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-deploy-doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
run: make prep

- name: Install Doxygen Dependencies
run: sudo apt-get install doxygen graphviz -y
run: sudo apt-get update && sudo apt-get install doxygen graphviz -y

- name: Install PDF Generation Dependencies
if: ${{ inputs.buildpdf == true }}
Expand Down
2 changes: 1 addition & 1 deletion apps/sch_lab
2 changes: 1 addition & 1 deletion cfe
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 168 files
2 changes: 1 addition & 1 deletion psp
Submodule psp updated 46 files
+5 −0 CHANGELOG.md
+0 −2 fsw/mcp750-vxworks/inc/cfe_psp_config.h
+1 −1 fsw/mcp750-vxworks/inc/psp_version.h
+0 −4 fsw/mcp750-vxworks/src/bsp-integration/cfeSupport.c
+1 −9 fsw/mcp750-vxworks/src/cfe_psp_exception.c
+0 −11 fsw/mcp750-vxworks/src/cfe_psp_memory.c
+0 −1 fsw/mcp750-vxworks/src/cfe_psp_ssr.c
+0 −2 fsw/mcp750-vxworks/src/cfe_psp_start.c
+0 −7 fsw/mcp750-vxworks/src/cfe_psp_support.c
+2 −7 fsw/mcp750-vxworks/src/cfe_psp_watchdog.c
+0 −7 fsw/modules/eeprom_direct/cfe_psp_eeprom_direct.c
+0 −1 fsw/modules/eeprom_mmap_file/cfe_psp_eeprom_mmap_file.c
+0 −7 fsw/modules/port_direct/cfe_psp_port_direct.c
+2 −8 fsw/modules/ram_direct/cfe_psp_ram_direct.c
+0 −2 fsw/modules/timebase_posix_clock/cfe_psp_timebase_posix_clock.c
+1 −6 fsw/modules/timebase_vxworks/cfe_psp_timebase_vxworks.c
+0 −1 fsw/pc-linux/inc/cfe_psp_config.h
+1 −1 fsw/pc-linux/inc/psp_version.h
+1 −7 fsw/pc-linux/src/cfe_psp_exception.c
+0 −21 fsw/pc-linux/src/cfe_psp_memory.c
+0 −1 fsw/pc-linux/src/cfe_psp_ssr.c
+1 −6 fsw/pc-linux/src/cfe_psp_start.c
+0 −6 fsw/pc-linux/src/cfe_psp_support.c
+1 −8 fsw/pc-linux/src/cfe_psp_watchdog.c
+0 −1 fsw/pc-rtems/inc/cfe_psp_config.h
+1 −1 fsw/pc-rtems/inc/psp_version.h
+1 −9 fsw/pc-rtems/src/cfe_psp_exception.c
+0 −10 fsw/pc-rtems/src/cfe_psp_memory.c
+0 −1 fsw/pc-rtems/src/cfe_psp_ssr.c
+0 −2 fsw/pc-rtems/src/cfe_psp_start.c
+0 −7 fsw/pc-rtems/src/cfe_psp_support.c
+1 −8 fsw/pc-rtems/src/cfe_psp_watchdog.c
+0 −2 fsw/shared/inc/cfe_psp_memory.h
+0 −2 fsw/shared/src/cfe_psp_error.c
+0 −4 fsw/shared/src/cfe_psp_memrange.c
+0 −2 fsw/shared/src/cfe_psp_memutils.c
+0 −4 fsw/shared/src/cfe_psp_module.c
+0 −8 fsw/shared/src/cfe_psp_version.c
+0 −1 unit-test-coverage/modules/timebase_vxworks/inc/cfe_psp_config.h
+0 −1 unit-test-coverage/modules/timebase_vxworks/src/coveragetest-timebase_vxworks.c
+1 −0 unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c
+0 −1 unit-test-coverage/ut-stubs/inc/PCS_moduleLib.h
+4 −0 unit-test-coverage/ut-stubs/src/vxworks-sysLib-stubs.c
+9 −0 unit-test-coverage/ut-stubs/src/vxworks-taskLib-stubs.c
+5 −0 unit-test-coverage/ut-stubs/src/vxworks-vxLib-stubs.c
+0 −8 ut-stubs/ut_psp_stubs.c
2 changes: 1 addition & 1 deletion tools/elf2cfetbl

0 comments on commit 35548bc

Please sign in to comment.