Merge pull request #58 from nasa/integration-candidate

Integration Candidate: 2020-08-19
nasa · Aug 25, 2020 · 70807fc · 70807fc
2 parents d4a78ba + 9358cba
commit 70807fc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,11 @@ To send telemtry to the "ground" or UDP/IP port, edit the subscription table in
 
 ## Version History
 
+### Development Build: 2.4.0-rc1+dev3
+
+- Remove reference to deprecated `CFE_ES_SHELL_TLM_MID`.
+- See <https://github.com/nasa/to_lab/pull/58>
+
 ### Development Build: 2.3.0+dev45
 
 - Fixes bug where an unset address values caused subscriptions to MsgId 0 over 200 times. Added a `TO_UNUSED` entry at the end of the subscription list and a break in the subscription loop when `TO_UNUSED` found. No more subscriptions on the unused table slots (no MsgId 0 subscriptions).

diff --git a/fsw/src/to_lab_version.h b/fsw/src/to_lab_version.h
@@ -30,8 +30,8 @@
  */
 
 /* Development Build Macro Definitions */
-#define TO_LAB_BUILD_NUMBER 44 /*!< Development Build: Number of commits since baseline */
-#define TO_LAB_BUILD_BASELINE "v2.3.0" /*!< Development Build: git tag that is the base for the current development */
+#define TO_LAB_BUILD_NUMBER 3 /*!< 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 */
 

diff --git a/fsw/tables/to_lab_sub.c b/fsw/tables/to_lab_sub.c
@@ -82,10 +82,6 @@ TO_LAB_Subs_t TO_LAB_Subs =
         {CFE_SB_MSGID_WRAP_VALUE(CFE_TBL_REG_TLM_MID), {0, 0}, 4},
         {CFE_SB_MSGID_WRAP_VALUE(CFE_EVS_LONG_EVENT_MSG_MID), {0, 0}, 32},
 
-    #ifndef CFE_OMIT_DEPRECATED_6_7
-        {CFE_SB_MSGID_WRAP_VALUE(CFE_ES_SHELL_TLM_MID), {0, 0}, 32},
-    #endif
-
         {CFE_SB_MSGID_WRAP_VALUE(CFE_ES_APP_TLM_MID), {0, 0}, 4},
         {CFE_SB_MSGID_WRAP_VALUE(CFE_ES_MEMSTATS_TLM_MID), {0, 0}, 4},