Skip to content

Commit

Permalink
Update build baseline and bump to v1.3.0-rc4+dev4
Browse files Browse the repository at this point in the history
- Set build baseline to cFS-Caelum-rc4: v1.3.0-rc4
- Update mission rev to use 0xFF for development version
  • Loading branch information
astrogeco committed Dec 6, 2021
1 parent 87d426c commit 545a276
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 @@ sample_app is an example for how to build and link an application in cFS. See al

## Version History

### Development Build: v1.3.0-rc4+dev4

- Use CFE_MSG_PTR conversion macro
- Update baseline for cFS-Caelum-rc4 to v1.3.0-rc4
- See <https://github.com/nasa/sample_app/pull/163> and <https://github.com/nasa/cFS/pull/390>

### Development Build: v1.2.0-rc1+dev73

- Apply CFE_SB_ValueToMsgId where required
Expand Down
19 changes: 13 additions & 6 deletions fsw/src/sample_app_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,23 @@

/* Development Build Macro Definitions */

#define SAMPLE_APP_BUILD_NUMBER 73 /*!< Development Build: Number of commits since baseline */
#define SAMPLE_APP_BUILD_NUMBER 4 /*!< Development Build: Number of commits since baseline */
#define SAMPLE_APP_BUILD_BASELINE \
"v1.2.0-rc1" /*!< Development Build: git tag that is the base for the current development */
"v1.3.0-rc4" /*!< Development Build: git tag that is the base for the current development */

/* Version Macro Definitions */

#define SAMPLE_APP_MAJOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
#define SAMPLE_APP_MINOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
#define SAMPLE_APP_REVISION 99 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. */
#define SAMPLE_APP_MISSION_REV 0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */
#define SAMPLE_APP_MAJOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
#define SAMPLE_APP_MINOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
#define SAMPLE_APP_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 SAMPLE_APP_MISSION_REV 0xFF

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

0 comments on commit 545a276

Please sign in to comment.