Skip to content

Commit

Permalink
Bump to v7.0.0-rc4+dev87
Browse files Browse the repository at this point in the history
IC: Caelum-rc4+dev6, nasa/cFS#443

- Reverts development version identifier to 99 for revision number
  • Loading branch information
astrogeco committed Mar 16, 2022
1 parent 848912c commit e8d50ff
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFS/blob

## Changelog

### Development Build: v7.0.0-rc4+dev87

- Revert development version identifier to 99 for revision number
- Use osal-common.doxygen to resolve OSAL Doxygen refs
- Refactor doxygen mainpage into frontpage
- See <https://github.com/nasa/cFE/pull/2066> and <https://github.com/nasa/cFS/pull/443>
### Development Build: v7.0.0-rc4+dev80

- Missing SB include for v2 msgid
Expand Down
2 changes: 1 addition & 1 deletion docs/src/cfs_versions.dox
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 3 additions & 4 deletions modules/core_api/fsw/inc/cfe_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,14 @@
/* 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 */
Expand Down

0 comments on commit e8d50ff

Please sign in to comment.