Skip to content

Commit

Permalink
IC: Caelum-rc4+dev55
Browse files Browse the repository at this point in the history 
*Combines:*

cFE v7.0.0-rc4+dev366
psp v1.6.0-rc4+dev82

**Includes:**

*cFE*
- nasa/cFE#2428

*psp*
- nasa/PSP#397
- nasa/PSP#402

Co-authored by: Daniel Knutsen <dmknutsen@users.noreply.github.com>
Co-authored by: Anh Van <avan989@users.noreply.github.com>
  • Loading branch information
@dzbaker
dzbaker committed Aug 18, 2023
1 parent ebd5014 commit 8a94326
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 3 files
+10 −0 CHANGELOG.md
+6 −1 modules/cfe_testcase/src/es_task_test.c
+1 −1 modules/core_api/fsw/inc/cfe_version.h
2 changes: 1 addition & 1 deletion psp
Submodule psp updated 8 files
+5 −0 CHANGELOG.md
+1 −1 fsw/mcp750-vxworks/inc/psp_version.h
+5 −0 fsw/modules/rtems_sysmon/CMakeLists.txt
+498 −0 fsw/modules/rtems_sysmon/rtems_sysmon.c
+1 −1 fsw/pc-linux/inc/psp_version.h
+1 −1 fsw/pc-rtems/inc/psp_version.h
+2 −0 fsw/pc-rtems/psp_module_list.cmake
+39 −6 fsw/shared/src/cfe_psp_module.c

0 comments on commit 8a94326

Please sign in to comment.