Skip to content

Commit 7a8343b

Browse files
committed
Merge pull request #79 from astrogeco/standardize-version.h
HOTFIX #73, Standardize version information
2 parents a07cd7a + 498cad1 commit 7a8343b

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

fsw/src/sample_lib_version.h

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,27 @@
3030
#define SAMPLE_LIB_BUILD_BASELINE \
3131
"v1.3.0-rc4" /*!< Development Build: git tag that is the base for the current development */
3232

33-
/* Version Macro Definitions */
34-
35-
#define SAMPLE_LIB_MAJOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
36-
#define SAMPLE_LIB_MINOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
37-
#define SAMPLE_LIB_REVISION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision number. */
33+
/*
34+
* Version Macros, see \ref cfsversions for definitions.
35+
*/
36+
#define SAMPLE_LIB_MAJOR_VERSION 1 /*!< @brief Major version number */
37+
#define SAMPLE_LIB_MINOR_VERSION 1 /*!< @brief Minor version number */
38+
#define SAMPLE_LIB_REVISION 99 /*!< @brief Revision version number. Value of 99 indicates a development version.*/
3839

3940
/*!
4041
* @brief Mission revision.
4142
*
4243
* Set to 0 on OFFICIAL releases, and set to 255 (0xFF) on development versions.
4344
* Values 1-254 are reserved for mission use to denote patches/customizations as needed.
4445
*/
46+
47+
/*!
48+
* @brief Mission revision.
49+
*
50+
* Reserved for mission use to denote patches/customizations as needed.
51+
* Values 1-254 are reserved for mission use to denote patches/customizations as needed. NOTE: Reserving 0 and 0xFF for
52+
* cFS open-source development use (pending resolution of nasa/cFS#440)
53+
*/
4554
#define SAMPLE_LIB_MISSION_REV 0xFF
4655

4756
#define SAMPLE_LIB_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer macros */

0 commit comments

Comments
 (0)