From fb722f5a309a802908b2ff8c207b30b3801d7ce2 Mon Sep 17 00:00:00 2001 From: astrogeco <59618057+astrogeco@users.noreply.github.com> Date: Mon, 24 Aug 2020 17:27:02 -0400 Subject: [PATCH] Increase verson to 2.4.0-rc1+dev2 Note: Changed build Baseline to 2.4.0-rc1 --- README.md | 7 ++++++- fsw/src/sch_lab_version.h | 29 ++++++++++++++--------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 3cb317f..dc90e01 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,11 @@ To change the list of packets that sch_lab sends out, edit the schedule table lo ## Version History +### Development Build: 2.4.0-rc1+dev2 + +- Reorganize the sch_lab table so it matches the sample_app usage and format. +- See + ### Development Build: 2.3.0+dev37 - Fixes schedule table documentation @@ -20,7 +25,7 @@ To change the list of packets that sch_lab sends out, edit the schedule table lo - Apply the CFE_SB_MsgIdToValue() and CFE_SB_ValueToMsgId() routines where compatibility with an integer MsgId is necessary - syslog prints, events, compile-time MID #define values. - See - + ### Development Build: 2.3.6 - Apply the CFE_SB_MsgIdToValue() and CFE_SB_ValueToMsgId() routines where compatibility with an integer MsgId is necessary - syslog prints, events, compile-time MID #define values. diff --git a/fsw/src/sch_lab_version.h b/fsw/src/sch_lab_version.h index dcf73fa..cf854f7 100644 --- a/fsw/src/sch_lab_version.h +++ b/fsw/src/sch_lab_version.h @@ -23,15 +23,15 @@ #define SCH_LAB_VERSION_H /*! @file SCH_LAB_version.h - * @brief Purpose: - * + * @brief Purpose: + * * The SCH Lab Application header file containing version information - * + * */ /* Development Build Macro Definitions */ -#define SCH_LAB_BUILD_NUMBER 37 /*!< Development Build: Number of commits since baseline */ -#define SCH_LAB_BUILD_BASELINE "v2.3.0" /*!< Development Build: git tag that is the base for the current development */ +#define SCH_LAB_BUILD_NUMBER 2 /*!< Development Build: Number of commits since baseline */ +#define SCH_LAB_BUILD_BASELINE "v2.4.0-rc1" /*!< Development Build: git tag that is the base for the current development */ /* Version Macro Definitions */ @@ -43,23 +43,22 @@ #define SCH_LAB_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer macros */ #define SCH_LAB_STR(x) SCH_LAB_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer macros */ -/*! @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 SCH_LAB_VERSION SCH_LAB_BUILD_BASELINE "+dev" SCH_LAB_STR(SCH_LAB_BUILD_NUMBER) +#define SCH_LAB_VERSION SCH_LAB_BUILD_BASELINE "+dev" SCH_LAB_STR(SCH_LAB_BUILD_NUMBER) /*! @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. -*/ -#define SCH_LAB_VERSION_STRING \ - " SCH Lab DEVELOPMENT BUILD " \ - SCH_LAB_VERSION \ - ", Last Official Release: v2.3.0" /* For full support please use this version */ + * @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. + */ +#define SCH_LAB_VERSION_STRING \ + " SCH Lab DEVELOPMENT BUILD " SCH_LAB_VERSION \ + ", Last Official Release: v2.3.0" /* For full support please use this version */ #endif /* SCH_LAB_VERSION_H */ /************************/ /* End of File Comment */ -/************************/ \ No newline at end of file +/************************/