Skip to content

Commit

Permalink
Fix nasa#1420, updating OSAL to use new versioning system.
Browse files Browse the repository at this point in the history
  • Loading branch information
dzbaker committed Dec 26, 2023
1 parent 1a8823f commit 7ff4c4c
Showing 1 changed file with 18 additions and 11 deletions.
29 changes: 18 additions & 11 deletions src/os/inc/osapi-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@
* Development Build Macro Definitions
*/
#define OS_BUILD_NUMBER 247
#define OS_BUILD_BASELINE "v6.0.0-rc4"
#define OS_BUILD_BASELINE "equuleus-rc1"
#define OS_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
#define OS_BUILD_TYPE "Development Build" /**< @brief: Development: Type of build (Development Build or Release) */
#define OS_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */

/*
* Version Macros, see \ref cfsversions for definitions.
Expand All @@ -44,14 +47,19 @@
#define OS_MINOR_VERSION 0 /*!< @brief Minor version number */
#define OS_REVISION 99 /*!< @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.
*
* Reserved for mission use to denote patches/customizations as needed.
* Values 1-254 are reserved for mission use to denote patches/customizations as needed. NOTE: Reserving 0 and 0xFF for
* cFS open-source development use (pending resolution of nasa/cFS#440)
*/
#define OS_MISSION_REV 0xFF
#define OS_MISSION_REV 0x00

/*
* Tools to construct version string
Expand All @@ -69,15 +77,6 @@
*/
#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 +151,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 */

0 comments on commit 7ff4c4c

Please sign in to comment.