Merge pull request #56 from nasa/integration-candidate

Integration candidate 2020-10-13
nasa · Oct 13, 2020 · 179a680 · 179a680
2 parents 6d9010a + ddbabad
commit 179a680
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git 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 <https://github.com/nasa/ci_lab/pull/56>
+
+
 ### Development Build: 2.3.0+dev36
 
 - Add build name and build number to version reporting

diff --git 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;

diff --git 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 */