From 0c15c1bec988f0f6feeae49cdb202b0ac13baa96 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Tue, 8 Sep 2020 16:13:29 -0400 Subject: [PATCH 1/2] Fix #54, Update CI to use osal_id_t Simple type change for consistency. --- fsw/src/ci_lab_app.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsw/src/ci_lab_app.c b/fsw/src/ci_lab_app.c index 9cb8f63..9019125 100644 --- a/fsw/src/ci_lab_app.c +++ b/fsw/src/ci_lab_app.c @@ -63,7 +63,7 @@ typedef struct bool SocketConnected; CFE_SB_PipeId_t CommandPipe; CFE_SB_MsgPtr_t MsgPtr; - uint32 SocketID; + osal_id_t SocketID; OS_SockAddr_t SocketAddress; CI_LAB_HkTlm_Buffer_t HkBuffer; From ddbabadd9601ea097863751df30369f88321bc2d Mon Sep 17 00:00:00 2001 From: astrogeco <59618057+astrogeco@users.noreply.github.com> Date: Tue, 13 Oct 2020 14:14:37 -0400 Subject: [PATCH 2/2] Bump to v2.4.0-rc1+dev2 and update ReadMe Set revision to 99 to indicate development version in telemetry. --- README.md | 8 ++++++++ fsw/src/ci_lab_version.h | 13 +++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 13afd07..79a5372 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,14 @@ ci_lab is a simple command uplink application that accepts CCSDS telecommand pac ## Version History + +### Development Build: 2.4.0-rc1+dev2 + +- Update the SocketID field to be `osal_id_t` instead of uint32 +- Set Revision number to 99 for development version identifier in telemetry +- See + + ### Development Build: 2.3.0+dev36 - Add build name and build number to version reporting diff --git a/fsw/src/ci_lab_version.h b/fsw/src/ci_lab_version.h index e580164..86172d2 100644 --- a/fsw/src/ci_lab_version.h +++ b/fsw/src/ci_lab_version.h @@ -32,15 +32,16 @@ /* Development Build Macro Definitions */ -#define CI_LAB_BUILD_NUMBER 36 /*!< Development Build: Number of commits since baseline */ -#define CI_LAB_BUILD_BASELINE "v2.3.0" /*!< Development Build: git tag that is the base for the current development */ +#define CI_LAB_BUILD_NUMBER 2 /*!< Development Build: Number of commits since baseline */ +#define CI_LAB_BUILD_BASELINE \ + "v2.4.0-rc1" /*!< Development Build: git tag that is the base for the current development */ /* Version Macro Definitions */ -#define CI_LAB_MAJOR_VERSION 2 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */ -#define CI_LAB_MINOR_VERSION 3 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */ -#define CI_LAB_REVISION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. */ -#define CI_LAB_MISSION_REV 0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */ +#define CI_LAB_MAJOR_VERSION 2 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */ +#define CI_LAB_MINOR_VERSION 3 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */ +#define CI_LAB_REVISION 99 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. */ +#define CI_LAB_MISSION_REV 0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */ #define CI_LAB_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer macros */ #define CI_LAB_STR(x) CI_LAB_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer macros */