Update build baseline and bump to v1.6.0-rc4+dev6

- Set new build baseline for cFS-Caelum-rc4: v1.6.0-rc4 - Standardize development indicators in psp_version.h to use 0xFF in MissionRev to indicate development version
nasa · Dec 6, 2021 · 5447a96 · 5447a96
1 parent 20a2a34
commit 5447a96
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,13 @@ This is a collection of APIs abstracting platform specific functionality to be l
 ## Version History
 
 
+### Development Build: v1.6.0-rc4+dev6
+
+- Sleep before exit when printing
+- Check the address in PSP get segment stubs
+- Set Build Baseline for cFS-Caelum-rc4: v1.6.0-rc4
+- See <https://github.com/nasa/PSP/pull/318> and <https://github.com/nasa/cFS/pull/390>
+
 ### Development Build: v1.5.0-rc1+dev124
 
 - Relax strict of check before calling "Init" function of module, only check that module type is not invalid

diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h
@@ -29,20 +29,25 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_PSP_IMPL_BUILD_NUMBER   124
-#define CFE_PSP_IMPL_BUILD_BASELINE "v1.5.0-rc1"
+#define CFE_PSP_IMPL_BUILD_NUMBER   4
+#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc1"
 
 /*
  * Version Macro Definitions
  */
 #define CFE_PSP_IMPL_MAJOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
 #define CFE_PSP_IMPL_MINOR_VERSION 4 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
 #define CFE_PSP_IMPL_REVISION      0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision number. */
-#define CFE_PSP_IMPL_MISSION_REV                                                                                      \
-    99 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. A value of "99" indicates an unreleased \
-          development version.  */
 
-#define CFE_PSP_IMPL_CODENAME "Bootes"
+/*!
+ * @brief Mission revision.
+ *
+ * Set to 0 on OFFICIAL releases, and set to 255 (0xFF) on development versions.
+ * Values 1-254 are reserved for mission use to denote patches/customizations as needed.
+ */
+#define CFE_PSP_IMPL_MISSION_REV 0xFF
+
+#define CFE_PSP_IMPL_CODENAME "Draco"
 
 /*
  * Tools to construct version string
@@ -61,8 +66,8 @@
  *  @details Reports the current development build's baseline, number, and name. Also includes a note about the latest
  * official version. @n See @ref cfsversions for format differences between development and release versions.
  */
-#define CFE_PSP_IMPL_VERSION_STRING                                                       \
-    " PSP Development Build " CFE_PSP_IMPL_VERSION /* Codename for current development */ \
-    ", Last Official Release: psp v1.4.0"          /* For full support please use this version */
+#define CFE_PSP_IMPL_VERSION_STRING                \
+    " PSP DEVELOPMENT BUILD " CFE_PSP_IMPL_VERSION \
+    ", Last Official Release: psp v1.4.0" /* For full support please use this version */
 
 #endif /* _psp_version_ */
diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h
@@ -29,20 +29,25 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_PSP_IMPL_BUILD_NUMBER   124
-#define CFE_PSP_IMPL_BUILD_BASELINE "v1.5.0-rc1"
+#define CFE_PSP_IMPL_BUILD_NUMBER   4
+#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc1"
 
 /*
  * Version Macro Definitions
  */
 #define CFE_PSP_IMPL_MAJOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
 #define CFE_PSP_IMPL_MINOR_VERSION 4 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
 #define CFE_PSP_IMPL_REVISION      0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision number. */
-#define CFE_PSP_IMPL_MISSION_REV                                                                                      \
-    99 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. A value of "99" indicates an unreleased \
-          development version.  */
 
-#define CFE_PSP_IMPL_CODENAME "Bootes"
+/*!
+ * @brief Mission revision.
+ *
+ * Set to 0 on OFFICIAL releases, and set to 255 (0xFF) on development versions.
+ * Values 1-254 are reserved for mission use to denote patches/customizations as needed.
+ */
+#define CFE_PSP_IMPL_MISSION_REV 0xFF
+
+#define CFE_PSP_IMPL_CODENAME "Draco"
 
 /*
  * Tools to construct version string

diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h
@@ -29,20 +29,25 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_PSP_IMPL_BUILD_NUMBER   124
-#define CFE_PSP_IMPL_BUILD_BASELINE "v1.5.0-rc1"
+#define CFE_PSP_IMPL_BUILD_NUMBER   4
+#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc1"
 
 /*
  * Version Macro Definitions
  */
 #define CFE_PSP_IMPL_MAJOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
 #define CFE_PSP_IMPL_MINOR_VERSION 4 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
 #define CFE_PSP_IMPL_REVISION      0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision number. */
-#define CFE_PSP_IMPL_MISSION_REV                                                                                      \
-    99 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. A value of "99" indicates an unreleased \
-          development version.  */
 
-#define CFE_PSP_IMPL_CODENAME "Bootes"
+/*!
+ * @brief Mission revision.
+ *
+ * Set to 0 on OFFICIAL releases, and set to 255 (0xFF) on development versions.
+ * Values 1-254 are reserved for mission use to denote patches/customizations as needed.
+ */
+#define CFE_PSP_IMPL_MISSION_REV 0xFF
+
+#define CFE_PSP_IMPL_CODENAME "Draco"
 
 /*
  * Tools to construct version string
@@ -61,8 +66,8 @@
  *  @details Reports the current development build's baseline, number, and name. Also includes a note about the latest
  * official version. @n See @ref cfsversions for format differences between development and release versions.
  */
-#define CFE_PSP_IMPL_VERSION_STRING                                                       \
-    " PSP DEVELOPMENT BUILD " CFE_PSP_IMPL_VERSION /* Codename for current development */ \
-    ", Last Official Release: psp v1.4.0"          /* For full support please use this version */
+#define CFE_PSP_IMPL_VERSION_STRING                \
+    " PSP DEVELOPMENT BUILD " CFE_PSP_IMPL_VERSION \
+    ", Last Official Release: psp v1.4.0" /* For full support please use this version */
 
-#endif /* _psp_version_ */
+#endif /* _psp_version_ */