Skip to content

Fix #897, EVS unregistered AppID #898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 1, 2020
Merged

Fix #897, EVS unregistered AppID #898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions fsw/cfe-core/src/evs/cfe_evs_task.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ typedef struct
typedef struct
{
CFE_ES_ResourceID_t AppID;
CFE_ES_ResourceID_t UnregAppID;

EVS_BinFilter_t BinFilters[CFE_PLATFORM_EVS_MAX_EVENT_FILTERS]; /* Array of binary filters */

uint8 ActiveFlag; /* Application event service active flag */
Expand Down
4 changes: 2 additions & 2 deletions fsw/cfe-core/src/evs/cfe_evs_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,13 @@ int32 EVS_NotRegistered (EVS_AppData_t *AppDataPtr, CFE_ES_ResourceID_t CallerID
char AppName[OS_MAX_API_NAME];

/* Send only one "not registered" event per application */
if (AppDataPtr->EventCount == 0)
if ( !CFE_ES_ResourceID_Equal(AppDataPtr->UnregAppID, CallerID) )
{
/* Increment count of "not registered" applications */
CFE_EVS_GlobalData.EVS_TlmPkt.Payload.UnregisteredAppCounter++;

/* Indicate that "not registered" event has been sent for this app */
AppDataPtr->EventCount++;
AppDataPtr->UnregAppID = CallerID;

/* Get the name of the "not registered" app */
CFE_ES_GetAppName(AppName, CallerID, OS_MAX_API_NAME);
Expand Down