Merge pull request #356 from nasa/integration-candidate

PSP Integration Candidate: Caelum-rc4+dev16
nasa · Aug 5, 2022 · de5ed1e · de5ed1e
2 parents 6264752 + e1f4286
commit de5ed1e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -9,6 +9,10 @@ This is a collection of APIs abstracting platform specific functionality to be l
 
 ## Changelog
 
+### Development Build: v1.6.0-rc4+dev47
+- correct PSP module IDs and lookups
+- See <https://github.com/nasa/PSP/pull/354>
+
 ### Development Build: v1.6.0-rc4+dev43
 
 - remove commented out code

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   43
+#define CFE_PSP_IMPL_BUILD_NUMBER   47
 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
 
 /*

diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h
@@ -27,7 +27,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_PSP_IMPL_BUILD_NUMBER   43
+#define CFE_PSP_IMPL_BUILD_NUMBER   47
 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
 
 /*

diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h
@@ -27,7 +27,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_PSP_IMPL_BUILD_NUMBER   43
+#define CFE_PSP_IMPL_BUILD_NUMBER   47
 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
 
 /*