From 7e669a34d2f0a8682106a5ce4e60b2e39e00baf6 Mon Sep 17 00:00:00 2001 From: astrogeco <59618057+astrogeco@users.noreply.github.com> Date: Mon, 31 Aug 2020 16:53:39 -0400 Subject: [PATCH 1/2] Fix #584, Set Revision to 99 for development build The version number macros major, minor, and revision, are used in the HK telemetry which can lead to confusion. --- src/os/inc/osapi-version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h index 1e00754a1..8ae89986f 100644 --- a/src/os/inc/osapi-version.h +++ b/src/os/inc/osapi-version.h @@ -38,7 +38,7 @@ */ #define OS_MAJOR_VERSION 5 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */ #define OS_MINOR_VERSION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */ -#define OS_REVISION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision number. */ +#define OS_REVISION 99/*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. If set to "99" it indicates a development version. */ #define OS_MISSION_REV 0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */ /* From a25109cd0bf96220866f93de03ad680126491c2e Mon Sep 17 00:00:00 2001 From: Yasir Khan Date: Mon, 21 Sep 2020 15:23:37 -0400 Subject: [PATCH 2/2] Increase version to 5.1.0-rc1+dev38, update readme. --- README.md | 5 +++++ src/os/inc/osapi-version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 39572f0a3..4626ee14e 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,11 @@ The autogenerated OSAL user's guide can be viewed at + + ### Development Build: 5.1.0-rc1+dev34 - Move this existing function into the public API, as it is performs more verification than the OS_ConvertToArrayIndex diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h index 05aff6ddc..e6d986d54 100644 --- a/src/os/inc/osapi-version.h +++ b/src/os/inc/osapi-version.h @@ -30,7 +30,7 @@ /* * Development Build Macro Definitions */ -#define OS_BUILD_NUMBER 34 +#define OS_BUILD_NUMBER 38 #define OS_BUILD_BASELINE "v5.1.0-rc1" /*