Merge pull request #404 from nasa/integration-candidate

PSP Integration candidate: Caelum-rc4+dev55
nasa · Aug 18, 2023 · fa18130 · fa18130
2 parents 47d2c1e + 0128f4a
commit fa18130
Show file tree

Hide file tree

Showing 8 changed files with 552 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Development Build: v1.6.0-rc4+dev82
+- Implement RTEMS Sysmons
+- find psp standard module
+- See <https://github.com/nasa/PSP/pull/397> and <https://github.com/nasa/PSP/pull/402>
+
 ## Development Build: v1.6.0-rc4+dev76
 - Create Workflow for IC Bundle Generation
 - See <https://github.com/nasa/PSP/pull/391>

diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h
@@ -27,7 +27,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_PSP_IMPL_BUILD_NUMBER   76
+#define CFE_PSP_IMPL_BUILD_NUMBER   82
 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
 
 /*

diff --git a/fsw/modules/rtems_sysmon/CMakeLists.txt b/fsw/modules/rtems_sysmon/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+# Pseudo-terminal interface module
+# add_definitions(-DDEBUG_BUILD)
+add_psp_module(rtems_sysmon rtems_sysmon.c)
+target_include_directories(rtems_sysmon PRIVATE $<TARGET_PROPERTY:iodriver,INTERFACE_INCLUDE_DIRECTORIES>)