Merge IC:Caelum-rc4+dev11, to_lab v2.5.0-rc4+dev21

- Remove registration of empty EVS filters - Update codeql workflow for reusable updates - See <nasa/cFS#505>
astrogeco · Jun 22, 2022 · 565d961 · 565d961
2 parents 21d562c + baa9988
commit 565d961
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -13,6 +13,13 @@ To send telemetry to the "ground" or UDP/IP port, edit the subscription table in
 
 ## Version History
 
+### Development Build: v2.5.0-rc4+dev21
+
+- Remove registration of empty EVS filters
+- Update codeql workflow for reusable updates
+- See <https://github.com/nasa/cFS/pull/505>
+
+
 ### Development Build: v2.5.0-rc4+dev16
 
 - Update Copyright Headers

diff --git a/fsw/src/to_lab_app.c b/fsw/src/to_lab_app.c
@@ -49,14 +49,6 @@ TO_LAB_GlobalData_t TO_LAB_Global;
 
 TO_LAB_Subs_t *  TO_LAB_Subs;
 CFE_TBL_Handle_t TO_SubTblHandle;
-/*
-** Event Filter Table
-*/
-static CFE_EVS_BinFilter_t CFE_TO_EVS_Filters[] = {/* Event ID    mask */
-                                                   {TO_INIT_INF_EID, 0x0000},       {TO_CRCMDPIPE_ERR_EID, 0x0000},
-                                                   {TO_SUBSCRIBE_ERR_EID, 0x0000},  {TO_TLMOUTSOCKET_ERR_EID, 0x0000},
-                                                   {TO_TLMOUTSTOP_ERR_EID, 0x0000}, {TO_MSGID_ERR_EID, 0x0000},
-                                                   {TO_FNCODE_ERR_EID, 0x0000},     {TO_NOOP_INF_EID, 0x0000}};
 
 /*
 ** Prototypes Section
@@ -152,10 +144,9 @@ int32 TO_LAB_init(void)
     strcpy(ToTlmPipeName, "TO_LAB_TLM_PIPE");
 
     /*
-    ** Register event filter table...
+    ** Register with EVS
     */
-    CFE_EVS_Register(CFE_TO_EVS_Filters, sizeof(CFE_TO_EVS_Filters) / sizeof(CFE_EVS_BinFilter_t),
-                     CFE_EVS_EventFilter_BINARY);
+    CFE_EVS_Register(NULL, 0, CFE_EVS_EventFilter_BINARY);
     /*
     ** Initialize housekeeping packet (clear user data area)...
     */

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 16 /*!< Development Build: Number of commits since baseline */
+#define TO_LAB_BUILD_NUMBER 21 /*!< 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 */