From 6a3a59c92e5ee5d0d938fe4d04e48d5d679edb51 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Wed, 13 Jan 2021 17:26:32 -0500 Subject: [PATCH] Fix #241, add missing '+dev' string to development version report --- fsw/inc/cfe_psp.h | 2 +- fsw/inc/cfe_psp_configdata.h | 2 +- fsw/mcp750-vxworks/inc/psp_version.h | 6 +++--- fsw/pc-linux/inc/psp_version.h | 6 +++--- fsw/pc-rtems/inc/psp_version.h | 6 +++--- fsw/shared/src/cfe_psp_configdata.c | 10 +++++----- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/fsw/inc/cfe_psp.h b/fsw/inc/cfe_psp.h index c340f983..608517c1 100644 --- a/fsw/inc/cfe_psp.h +++ b/fsw/inc/cfe_psp.h @@ -151,7 +151,7 @@ #define CFE_PSP_MINOR_VERSION (GLOBAL_PSP_CONFIGDATA.PSP_VersionInfo.MinorVersion) #define CFE_PSP_REVISION (GLOBAL_PSP_CONFIGDATA.PSP_VersionInfo.Revision) #define CFE_PSP_MISSION_REV (GLOBAL_PSP_CONFIGDATA.PSP_VersionInfo.MissionRev) -#define CFE_PSP_VERSION (GLOBAL_PSP_CONFIGDATA.PSP_VersionInfo.Version) +#define CFE_PSP_VERSION (GLOBAL_PSP_CONFIGDATA.PSP_VersionInfo.VersionString) /* ** Type Definitions diff --git a/fsw/inc/cfe_psp_configdata.h b/fsw/inc/cfe_psp_configdata.h index 8c77b1b2..0dacd68c 100644 --- a/fsw/inc/cfe_psp_configdata.h +++ b/fsw/inc/cfe_psp_configdata.h @@ -43,7 +43,7 @@ typedef const struct uint8 MinorVersion; uint8 Revision; uint8 MissionRev; - char Version[16]; + char VersionString[32]; } CFE_PSP_VersionInfo_t; /** diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h index 4d57d844..980a8898 100644 --- a/fsw/mcp750-vxworks/inc/psp_version.h +++ b/fsw/mcp750-vxworks/inc/psp_version.h @@ -49,13 +49,13 @@ #define CFE_PSP_IMPL_STR(x) \ CFE_PSP_IMPL_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer */ -/*! @brief Development Build Version Number. +/*! @brief DEVELOPMENT Build Version Number. * @details Baseline git tag + Number of commits since baseline. @n * See @ref cfsversions for format differences between development and release versions. */ -#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER) +#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE "+dev" CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER) -/*! @brief Development Build Version String. +/*! @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. @n See @ref cfsversions for format differences between development and release versions. */ diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h index dc3eb209..5202395b 100644 --- a/fsw/pc-linux/inc/psp_version.h +++ b/fsw/pc-linux/inc/psp_version.h @@ -49,13 +49,13 @@ #define CFE_PSP_IMPL_STR(x) \ CFE_PSP_IMPL_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer */ -/*! @brief Development Build Version Number. +/*! @brief DEVELOPMENT Build Version Number. * @details Baseline git tag + Number of commits since baseline. @n * See @ref cfsversions for format differences between development and release versions. */ -#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER) +#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE "+dev" CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER) -/*! @brief Development Build Version String. +/*! @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. @n See @ref cfsversions for format differences between development and release versions. */ diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h index 63daffcd..8572a3d6 100644 --- a/fsw/pc-rtems/inc/psp_version.h +++ b/fsw/pc-rtems/inc/psp_version.h @@ -49,13 +49,13 @@ #define CFE_PSP_IMPL_STR(x) \ CFE_PSP_IMPL_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer */ -/*! @brief Development Build Version Number. +/*! @brief DEVELOPMENT Build Version Number. * @details Baseline git tag + Number of commits since baseline. @n * See @ref cfsversions for format differences between development and release versions. */ -#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER) +#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE "+dev" CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER) -/*! @brief Development Build Version String. +/*! @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. @n See @ref cfsversions for format differences between development and release versions. */ diff --git a/fsw/shared/src/cfe_psp_configdata.c b/fsw/shared/src/cfe_psp_configdata.c index 31e748d3..1a4374be 100644 --- a/fsw/shared/src/cfe_psp_configdata.c +++ b/fsw/shared/src/cfe_psp_configdata.c @@ -45,8 +45,8 @@ Target_PspConfigData GLOBAL_PSP_CONFIGDATA = {.PSP_WatchdogMin = CFE_PSP_WATCHD .HW_NumEepromBanks = CFE_PSP_NUM_EEPROM_BANKS, - .PSP_VersionInfo = {.MajorVersion = CFE_PSP_IMPL_MAJOR_VERSION, - .MinorVersion = CFE_PSP_IMPL_MINOR_VERSION, - .Revision = CFE_PSP_IMPL_REVISION, - .MissionRev = CFE_PSP_IMPL_MISSION_REV, - .Version = CFE_PSP_IMPL_VERSION}}; + .PSP_VersionInfo = {.MajorVersion = CFE_PSP_IMPL_MAJOR_VERSION, + .MinorVersion = CFE_PSP_IMPL_MINOR_VERSION, + .Revision = CFE_PSP_IMPL_REVISION, + .MissionRev = CFE_PSP_IMPL_MISSION_REV, + .VersionString = CFE_PSP_IMPL_VERSION}};