Skip to content

Commit

Permalink
Set new baseline and bump to v2.5.0-rc4+dev4
Browse files Browse the repository at this point in the history
- Sets new baseline for cFS-Caelum-rc4: v2.5.0-rc4
- Update mission rev to use 0xFF for development version
  • Loading branch information
astrogeco committed Dec 1, 2021
1 parent 9283188 commit c075480
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 6 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/nasa/ci_lab/pull/101> and <https://github.com/nasa/cFS/pull/390>

### Development Build: v2.4.0-rc1+dev46

- Apply CFE_SB_ValueToMsgId where required
Expand Down
19 changes: 13 additions & 6 deletions fsw/src/ci_lab_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit c075480

Please sign in to comment.