Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integration Candidate: 2020-09-16 #600

Merged
merged 3 commits into from
Sep 22, 2020
Merged

Integration Candidate: 2020-09-16 #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e669a3
Fix #584, Set Revision to 99 for development build
astrogeco Aug 31, 2020
6f05fbd
Merge pull request #585 from astrogeco/584-fix-version-es-hk
yammajamma Sep 17, 2020
a25109c
Increase version to 5.1.0-rc1+dev38, update readme.
yammajamma Sep 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ The autogenerated OSAL user's guide can be viewed at <https://github.com/nasa/cF

## Version History

### Development Build: 5.1.0-rc1+dev38
- Sets Revision to 99 for development builds
- See <https://github.com/nasa/osal/pull/600>


### 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
Expand Down
4 changes: 2 additions & 2 deletions src/os/inc/osapi-version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
/*
* Development Build Macro Definitions
*/
#define OS_BUILD_NUMBER 34
#define OS_BUILD_NUMBER 38
#define OS_BUILD_BASELINE "v5.1.0-rc1"

/*
* Version Macro Definitions
*/
#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 */

/*
Expand Down