Merge IC:Caelum-rc4+dev11, sample_app v1.3.0-rc4+dev21

- Remove registration of empty event filters - Update codeql workflow for reusable updates - See <nasa/cFS#505>
astrogeco · Jun 22, 2022 · a4dd1ce · a4dd1ce
2 parents 83824aa + d5d5f52
commit a4dd1ce
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,12 @@ sample_app is an example for how to build and link an application in cFS. See al
 
 ## Version History
 
+### Development Build: v1.3.0-rc4+dev21
+
+- Remove registration of empty event filters
+- Update codeql workflow for reusable updates
+- See <https://github.com/nasa/cFS/pull/505> 
+
 ### Development Build: v1.3.0-rc4+dev16
 
 - Update copyright headers

diff --git a/fsw/src/sample_app.c b/fsw/src/sample_app.c
@@ -128,28 +128,10 @@ int32 SAMPLE_APP_Init(void)
     strncpy(SAMPLE_APP_Data.PipeName, "SAMPLE_APP_CMD_PIPE", sizeof(SAMPLE_APP_Data.PipeName));
     SAMPLE_APP_Data.PipeName[sizeof(SAMPLE_APP_Data.PipeName) - 1] = 0;
 
-    /*
-    ** Initialize event filter table...
-    */
-    SAMPLE_APP_Data.EventFilters[0].EventID = SAMPLE_APP_STARTUP_INF_EID;
-    SAMPLE_APP_Data.EventFilters[0].Mask    = 0x0000;
-    SAMPLE_APP_Data.EventFilters[1].EventID = SAMPLE_APP_COMMAND_ERR_EID;
-    SAMPLE_APP_Data.EventFilters[1].Mask    = 0x0000;
-    SAMPLE_APP_Data.EventFilters[2].EventID = SAMPLE_APP_COMMANDNOP_INF_EID;
-    SAMPLE_APP_Data.EventFilters[2].Mask    = 0x0000;
-    SAMPLE_APP_Data.EventFilters[3].EventID = SAMPLE_APP_COMMANDRST_INF_EID;
-    SAMPLE_APP_Data.EventFilters[3].Mask    = 0x0000;
-    SAMPLE_APP_Data.EventFilters[4].EventID = SAMPLE_APP_INVALID_MSGID_ERR_EID;
-    SAMPLE_APP_Data.EventFilters[4].Mask    = 0x0000;
-    SAMPLE_APP_Data.EventFilters[5].EventID = SAMPLE_APP_LEN_ERR_EID;
-    SAMPLE_APP_Data.EventFilters[5].Mask    = 0x0000;
-    SAMPLE_APP_Data.EventFilters[6].EventID = SAMPLE_APP_PIPE_ERR_EID;
-    SAMPLE_APP_Data.EventFilters[6].Mask    = 0x0000;
-
     /*
     ** Register the events
     */
-    status = CFE_EVS_Register(SAMPLE_APP_Data.EventFilters, SAMPLE_APP_EVENT_COUNTS, CFE_EVS_EventFilter_BINARY);
+    status = CFE_EVS_Register(NULL, 0, CFE_EVS_EventFilter_BINARY);
     if (status != CFE_SUCCESS)
     {
         CFE_ES_WriteToSysLog("Sample App: Error Registering Events, RC = 0x%08lX\n", (unsigned long)status);

diff --git a/fsw/src/sample_app.h b/fsw/src/sample_app.h
@@ -85,8 +85,7 @@ typedef struct
     char   PipeName[CFE_MISSION_MAX_API_LEN];
     uint16 PipeDepth;
 
-    CFE_EVS_BinFilter_t EventFilters[SAMPLE_APP_EVENT_COUNTS];
-    CFE_TBL_Handle_t    TblHandles[SAMPLE_APP_NUMBER_OF_TABLES];
+    CFE_TBL_Handle_t TblHandles[SAMPLE_APP_NUMBER_OF_TABLES];
 
 } SAMPLE_APP_Data_t;
 

diff --git a/fsw/src/sample_app_events.h b/fsw/src/sample_app_events.h
@@ -34,6 +34,4 @@
 #define SAMPLE_APP_LEN_ERR_EID           6
 #define SAMPLE_APP_PIPE_ERR_EID          7
 
-#define SAMPLE_APP_EVENT_COUNTS 7
-
 #endif /* SAMPLE_APP_EVENTS_H */
diff --git a/fsw/src/sample_app_version.h b/fsw/src/sample_app_version.h
@@ -27,7 +27,7 @@
 
 /* Development Build Macro Definitions */
 
-#define SAMPLE_APP_BUILD_NUMBER 16 /*!< Development Build: Number of commits since baseline */
+#define SAMPLE_APP_BUILD_NUMBER 21 /*!< Development Build: Number of commits since baseline */
 #define SAMPLE_APP_BUILD_BASELINE \
     "v1.3.0-rc4" /*!< Development Build: git tag that is the base for the current development */