From 86c44352ade176ed1edf7a73defc338f5e32431c Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Tue, 8 Sep 2020 16:13:41 -0400 Subject: [PATCH 1/2] Fix #60, Update TO to use osal_id_t Simple type change for consistency. --- fsw/src/to_lab_app.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsw/src/to_lab_app.c b/fsw/src/to_lab_app.c index df30069..2047958 100644 --- a/fsw/src/to_lab_app.c +++ b/fsw/src/to_lab_app.c @@ -54,7 +54,7 @@ typedef struct { CFE_SB_PipeId_t Tlm_pipe; CFE_SB_PipeId_t Cmd_pipe; - uint32 TLMsockid; + osal_id_t TLMsockid; bool downlink_on; char tlm_dest_IP[17]; bool suppress_sendto; From 93b94d246d8434fa705f5a24cf9ccc008a3a9006 Mon Sep 17 00:00:00 2001 From: astrogeco <59618057+astrogeco@users.noreply.github.com> Date: Tue, 13 Oct 2020 14:46:32 -0400 Subject: [PATCH 2/2] Bump to v2.4.0-rc1+dev9 and update ReadMe Set revision number to 99 to indicate development version in telemetry Run clang format on to_lab_version.h --- README.md | 10 ++++++++-- fsw/src/to_lab_version.h | 36 ++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 8e8f8dd..8fe2691 100644 --- a/README.md +++ b/README.md @@ -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 + ### Development Build: 2.4.0-rc1+dev6 - Adds header guard to `to_lab_sub_table.h` @@ -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 ### Development Build: 2.3.5 - Apply code style - See - + ### Development Build: 2.3.4 - Configure the maximum depth supported by OSAL, rather than a hard coded 64. diff --git a/fsw/src/to_lab_version.h b/fsw/src/to_lab_version.h index d1a9283..243fbbf 100644 --- a/fsw/src/to_lab_version.h +++ b/fsw/src/to_lab_version.h @@ -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 */