From c07548042b07fe4491903ed210dde8958dd2bd94 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Wed, 1 Dec 2021 15:45:51 -0500 Subject: [PATCH] Set new baseline and bump to v2.5.0-rc4+dev4 - Sets new baseline for cFS-Caelum-rc4: v2.5.0-rc4 - Update mission rev to use 0xFF for development version --- README.md | 6 ++++++ fsw/src/ci_lab_version.h | 19 +++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 82e193e..5c1455e 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,12 @@ ci_lab is a simple command uplink application that accepts CCSDS telecommand pac ## Version History +### Development Build: v2.5.0-rc4+dev4 + +- Use CFE_MSG_PTR conversion macro +- Update baseline for cFS-Caelum-rc4 to v2.5.0-rc4 +- See and + ### Development Build: v2.4.0-rc1+dev46 - Apply CFE_SB_ValueToMsgId where required diff --git a/fsw/src/ci_lab_version.h b/fsw/src/ci_lab_version.h index 7d53a36..4ac6cc6 100644 --- a/fsw/src/ci_lab_version.h +++ b/fsw/src/ci_lab_version.h @@ -32,16 +32,23 @@ /* Development Build Macro Definitions */ -#define CI_LAB_BUILD_NUMBER 46 /*!< Development Build: Number of commits since baseline */ +#define CI_LAB_BUILD_NUMBER 4 /*!< Development Build: Number of commits since baseline */ #define CI_LAB_BUILD_BASELINE \ - "v2.4.0-rc1" /*!< Development Build: git tag that is the base for the current development */ + "v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */ /* Version Macro Definitions */ -#define CI_LAB_MAJOR_VERSION 2 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */ -#define CI_LAB_MINOR_VERSION 3 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */ -#define CI_LAB_REVISION 99 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. */ -#define CI_LAB_MISSION_REV 0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */ +#define CI_LAB_MAJOR_VERSION 2 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */ +#define CI_LAB_MINOR_VERSION 3 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */ +#define CI_LAB_REVISION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version 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. + */ +#define CI_LAB_MISSION_REV 0xFF #define CI_LAB_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer macros */ #define CI_LAB_STR(x) CI_LAB_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer macros */