Skip to content

Commit

Permalink
Set new build baseline and bump to v2.5.0-rc4+dev6
Browse files Browse the repository at this point in the history
- Set new build baseline for cFS-Caelum-rc4: v2.5.0-rc4
- Update mission rev to use 0xFF for development version
  • Loading branch information
astrogeco committed Dec 6, 2021
1 parent 01bccb4 commit 5605524
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 3 deletions.
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ To change the list of packets that sch_lab sends out, edit the schedule table lo

## Version History

### Development Build: v2.5.0-rc4+dev6

- Use separate address variable
- Use CFE_MSG_PTR conversion macro
- Update baseline for cFS-Caelum-rc4: v2.5.0-rc4
- See <https://github.com/nasa/sch_lab/pull/102> and <https://github.com/nasa/cFS/pull/390>

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

- Apply CFE_SB_ValueToMsgId where required
Expand Down
13 changes: 10 additions & 3 deletions fsw/src/sch_lab_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,23 @@
*/

/* Development Build Macro Definitions */
#define SCH_LAB_BUILD_NUMBER 53 /*!< Development Build: Number of commits since baseline */
#define SCH_LAB_BUILD_NUMBER 6 /*!< Development Build: Number of commits since baseline */
#define SCH_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 SCH_LAB_MAJOR_VERSION 2 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
#define SCH_LAB_MINOR_VERSION 3 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
#define SCH_LAB_REVISION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. */
#define SCH_LAB_MISSION_REV 0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */

/*!
* @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 SCH_LAB_MISSION_REV 0xFF

#define SCH_LAB_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer macros */
#define SCH_LAB_STR(x) SCH_LAB_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer macros */
Expand Down

0 comments on commit 5605524

Please sign in to comment.