Merge pull request nasa#161 from nasa/integration-candidate

to_lab Integration candidate: Caelum-rc4+dev59
jphickey · Sep 14, 2023 · 20e4792 · 20e4792
2 parents 81d85da + 7ed6b8b
commit 20e4792
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: v2.5.0-rc4+dev49
+- Remove unused/unnecessary TO_LAB_UNUSED
+- See <https://github.com/nasa/to_lab/pull/160>
+
 ## Development Build: v2.5.0-rc4+dev45
 - adjust subscription table based on apps present
 - See <https://github.com/nasa/to_lab/pull/153>

diff --git a/fsw/src/to_lab_app.c b/fsw/src/to_lab_app.c
@@ -204,7 +204,7 @@ int32 TO_LAB_init(void)
     {
         if (!CFE_SB_IsValidMsgId(TO_LAB_Subs->Subs[i].Stream))
         {
-            /* Only process until invalid MsgId (aka TO_LAB_UNUSED) is found*/
+            /* Only process until invalid MsgId is found*/
             break;
         }
         else if (CFE_SB_IsValidMsgId(TO_LAB_Subs->Subs[i].Stream))

diff --git a/fsw/src/to_lab_app.h b/fsw/src/to_lab_app.h
@@ -36,7 +36,6 @@
 /*****************************************************************************/
 
 #define TO_LAB_TASK_MSEC 500 /* run at 2 Hz */
-#define TO_LAB_UNUSED    CFE_SB_MSGID_RESERVED
 
 /**
  * Depth of pipe for commands to the TO_LAB application itself

diff --git a/fsw/src/to_lab_version.h b/fsw/src/to_lab_version.h
@@ -24,7 +24,7 @@
 #define TO_LAB_VERSION_H
 
 /* Development Build Macro Definitions */
-#define TO_LAB_BUILD_NUMBER 45 /*!< Development Build: Number of commits since baseline */
+#define TO_LAB_BUILD_NUMBER 49 /*!< Development Build: Number of commits since baseline */
 #define TO_LAB_BUILD_BASELINE \
     "v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */