From e5be0612ad6bf9db09ddf640306a65292abce2d5 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Wed, 16 Mar 2022 17:34:51 -0400 Subject: [PATCH] Bump to v7.0.0-rc4+dev87 IC: Caelum-rc4+dev6, nasa/cFS#443 - Reverts development version identifier to 99 for revision number --- README.md | 6 ++++++ docs/src/cfs_versions.dox | 2 +- modules/core_api/fsw/inc/cfe_version.h | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 34583defe..583aba37a 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,12 @@ The detailed cFE user's guide can be viewed at and ### Development Build: v7.0.0-rc4+dev80 - Missing SB include for v2 msgid diff --git a/docs/src/cfs_versions.dox b/docs/src/cfs_versions.dox index 8e3c871fb..5a21cf583 100644 --- a/docs/src/cfs_versions.dox +++ b/docs/src/cfs_versions.dox @@ -22,7 +22,7 @@ bug fixes or major documentation updates. The Revision number may also be updated if there are other changes contained within a release that make it desirable for applications to distinguish one release from another. - WARNING: The revision number is set to the number 99 in development builds. To distinguish between development + WARNING: The revision number is set to the number 0xFF in development builds. To distinguish between development builds refer to the BUILD_NUMBER and BUILD_BASELINE detailed in the section "Identifying Development Builds". The Mission Version number is set to zero in all official releases, and is reserved for the mission use. diff --git a/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h index 77d468f48..4fb0316ff 100644 --- a/modules/core_api/fsw/inc/cfe_version.h +++ b/modules/core_api/fsw/inc/cfe_version.h @@ -34,15 +34,15 @@ /* Version Macro Definitions updated for official releases only */ #define CFE_MAJOR_VERSION 6 /**< @brief Major release version (Former for Revision == 99) */ #define CFE_MINOR_VERSION 7 /**< @brief Minor release version (Former for Revision == 99) */ -#define CFE_REVISION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision number. */ +#define CFE_REVISION \ + 99 /*!< @brief * Set to 0 on OFFICIAL releases, and set to 99 on development versions. Revision number. */ /*! * @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. + * Reserved for mission use to denote patches/customizations as needed. */ -#define CFE_MISSION_REV 0xFF +#define CFE_MISSION_REV 0 #define CFE_STR_HELPER(x) #x /**< @brief Convert argument to string */ #define CFE_STR(x) CFE_STR_HELPER(x) /**< @brief Expand macro before conversion */