Merge pull request #199 from nasa/integration-candidate

to_lab Integration candidate: Equuleus-rc1+dev12

Author: dzbaker

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev56
+- Add CFE_EVS_SHORT_EVENT_MSG_MID to to_lab_sub.c
+- See <https://github.com/nasa/to_lab/pull/198>
+
 ## Development Build: equuleus-rc1+dev52
 - Zero-out global data during init + set RunStatus to APP_ERROR if init fails
 - See <https://github.com/nasa/to_lab/pull/188>

fsw/src/to_lab_version.h

@@ -24,7 +24,7 @@
 #define TO_LAB_VERSION_H
 
 /* Development Build Macro Definitions */
-#define TO_LAB_BUILD_NUMBER     52 /*!< Development Build: Number of commits since baseline */
+#define TO_LAB_BUILD_NUMBER     56 /*!< Development Build: Number of commits since baseline */
 #define TO_LAB_BUILD_BASELINE   "equuleus-rc1" /*!< Development Build: git tag that is the base for the current development */
 #define TO_LAB_BUILD_DEV_CYCLE  "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
 #define TO_LAB_BUILD_CODENAME   "Equuleus" /**< @brief: Development: Code name for the current build */

fsw/tables/to_lab_sub.c

@@ -73,7 +73,7 @@ TO_LAB_Subs_t TO_LAB_Subs = {.Subs = {/* CFS App Subscriptions */
                                       {CFE_SB_MSGID_WRAP_VALUE(CFE_SB_STATS_TLM_MID), {0, 0}, 4},
                                       {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},
-
+                                      {CFE_SB_MSGID_WRAP_VALUE(CFE_EVS_SHORT_EVENT_MSG_MID), {0, 0}, 32},
                                       {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},