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

Fix #1420, updating OSAL to use new versioning system. #1437

Merged
merged 2 commits into from
Jan 18, 2024
Merged

Fix #1420, updating OSAL to use new versioning system. #1437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
089bf8d
Fix #1420, updating OSAL to use new versioning system.
dzbaker Dec 26, 2023
9de67c9
Merge branch 'main' into fix-1420
dzbaker Jan 17, 2024
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
35 changes: 18 additions & 17 deletions src/os/inc/osapi-version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,22 @@
/*
* Development Build Macro Definitions
*/
#define OS_BUILD_NUMBER 251
#define OS_BUILD_BASELINE "v6.0.0-rc4"
#define OS_BUILD_NUMBER 251
#define OS_BUILD_BASELINE "equuleus-rc1"
#define OS_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
#define OS_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */

/*
* Version Macros, see \ref cfsversions for definitions.
*/
#define OS_MAJOR_VERSION 5 /*!< @brief Major version number */
#define OS_MINOR_VERSION 0 /*!< @brief Minor version number */
#define OS_REVISION 99 /*!< @brief Revision version number. Value of 99 indicates a development version.*/
#define OS_REVISION 0 /*!< @brief Revision version number. Value of 99 indicates a development version.*/

/**
* @brief Last official release.
*/
#define OS_LAST_OFFICIAL "v5.0.0"

/*!
* @brief Mission revision.
Expand All @@ -64,20 +71,6 @@
*/
#define OS_VERSION OS_BUILD_BASELINE "+dev" OS_STR(OS_BUILD_NUMBER)

/*! @brief Version code name
* All modular components which are tested/validated together should share the same code name
*/
#define OS_VERSION_CODENAME "Draco"

/*! @brief Development Build Version String.
* @details Reports the current development build's baseline, number, and name. Also includes a note about the latest
* official version.
*/
#define OS_VERSION_STRING \
" OSAL Development Build\n" \
" " OS_VERSION " (Codename: " OS_VERSION_CODENAME ")\n" /* Codename for current development */ \
" Latest Official Version: osal v5.0.0" /* For full support please use official release version */

/*! @brief Combines the revision components into a single value
* @details Applications can check against this number @n
* e.g. "#if OSAL_API_VERSION >= 40100" would check if some feature added in
Expand Down Expand Up @@ -152,4 +145,12 @@ void OS_GetVersionNumber(uint8 VersionNumbers[4]);
*/
uint32 OS_GetBuildNumber(void);

/**
* @brief Max Version String length.
*
* Maximum length that an OSAL version string can be.
*
*/
#define OS_CFG_MAX_VERSION_STR_LEN 256

#endif /* OSAPI_VERSION_H */
2 changes: 1 addition & 1 deletion src/os/shared/src/osapi-version.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const char *OS_GetVersionString(void)
*-----------------------------------------------------------------*/
const char *OS_GetVersionCodeName(void)
{
return OS_VERSION_CODENAME;
return OS_BUILD_CODENAME;
}

/*----------------------------------------------------------------
Expand Down
Loading