Skip to content

Commit

Permalink
Bump to v2.4.0-rc1+dev9 and update ReadMe
Browse files Browse the repository at this point in the history
Set revision number to 99 to indicate development version in telemetry
Run clang format on to_lab_version.h
  • Loading branch information
astrogeco committed Oct 13, 2020
1 parent 1c1a12d commit 93b94d2
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 20 deletions.
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ To send telemtry to the "ground" or UDP/IP port, edit the subscription table in

## Version History

### Development Build: 2.4.0-rc1+dev9

- Update the TLMsockid field to be `osal_id_t` instead of uint32
- Set revision number to 99 to indicate development status in telemetry
- See <https://github.com/nasa/to_lab/pull/59>

### Development Build: 2.4.0-rc1+dev6

- Adds header guard to `to_lab_sub_table.h`
Expand All @@ -35,14 +41,14 @@ To send telemtry to the "ground" or UDP/IP port, edit the subscription table in

### Development Build: 2.3.6

- Replace references to `ccsds.h` types with the `cfe_sb.h`-provided type.
- Replace references to `ccsds.h` types with the `cfe_sb.h`-provided type.
- See <https://github.com/nasa/to_lab/pull/44>

### Development Build: 2.3.5

- Apply code style
- See <https://github.com/nasa/to_lab/pull/43>

### Development Build: 2.3.4

- Configure the maximum depth supported by OSAL, rather than a hard coded 64.
Expand Down
36 changes: 18 additions & 18 deletions fsw/src/to_lab_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,40 +23,40 @@
#define TO_LAB_VERSION_H

/*! @file to_lab_version.h
* @brief Purpose:
*
* @brief Purpose:
*
* The TO Lab Application header file containing version information
*
*
*/

/* Development Build Macro Definitions */
#define TO_LAB_BUILD_NUMBER 6 /*!< Development Build: Number of commits since baseline */
#define TO_LAB_BUILD_BASELINE "v2.4.0-rc1" /*!< Development Build: git tag that is the base for the current development */
#define TO_LAB_BUILD_NUMBER 9 /*!< Development Build: Number of commits since baseline */
#define TO_LAB_BUILD_BASELINE \
"v2.4.0-rc1" /*!< Development Build: git tag that is the base for the current development */

/* Version Macro Definitions */

#define TO_LAB_MAJOR_VERSION 2 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
#define TO_LAB_MINOR_VERSION 3 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
#define TO_LAB_REVISION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. */
#define TO_LAB_MISSION_REV 0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */
#define TO_LAB_MAJOR_VERSION 2 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
#define TO_LAB_MINOR_VERSION 3 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
#define TO_LAB_REVISION 99 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. */
#define TO_LAB_MISSION_REV 0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */

#define TO_LAB_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer macros */
#define TO_LAB_STR(x) TO_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 TO_LAB_VERSION TO_LAB_BUILD_BASELINE "+dev" TO_LAB_STR(TO_LAB_BUILD_NUMBER)
#define TO_LAB_VERSION TO_LAB_BUILD_BASELINE "+dev" TO_LAB_STR(TO_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 TO_LAB_VERSION_STRING \
" TO Lab DEVELOPMENT BUILD " \
TO_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 TO_LAB_VERSION_STRING \
" TO Lab DEVELOPMENT BUILD " TO_LAB_VERSION \
", Last Official Release: v2.3.0" /* For full support please use this version */

#endif /* TO_LAB_VERSION_H */

Expand Down

0 comments on commit 93b94d2

Please sign in to comment.