Skip to content
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

Fix #2095, Automatic suppression of flooding events #2109

Closed
wants to merge 11 commits into from
+476 −41
Closed

Fix #2095, Automatic suppression of flooding events #2109

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7f69279
Fix #2095, Automatic suppression of flooding events
jhnphm May 25, 2022
9379f37
Fix formatting issues and segfault in unit tests, and retested on sp0
jhnphm Jun 2, 2022
ea15e8d
Address github and peer review comments
jhnphm Jun 6, 2022
4be5407
Add documentation blurbs and diagram
jhnphm Jun 6, 2022
da9a2d1
Fix zero-crossing squelch event not being emitted, and add CFE error …
jhnphm Jun 7, 2022
920ddd5
Make squelched count saturating
jhnphm Jun 7, 2022
7aa0ceb
Fix formatting
jhnphm Jun 7, 2022
0009a04
Add requirements
jhnphm Jun 7, 2022
d8eb850
Merge branch 'auto-event-suppression' of ssh://va31spax062f:/data/wor…
jhnphm Jun 7, 2022
8da13d6
Revert excel-induced changes in requirements list, only add new requi…
jhnphm Jun 7, 2022
0c4b41d
Tweak limit checks on compile time parameters
jhnphm Jun 7, 2022
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
Prev Previous commit
Next Next commit
Fix formatting
@jhnphm
jhnphm committed Jun 7, 2022
commit 7aa0ceb2bcc4fbf633389210abebaa061a1e6514
4 changes: 2 additions & 2 deletions modules/evs/fsw/src/cfe_evs_utils.c
View file
Original file line number Diff line number Diff line change
@@ -366,10 +366,10 @@ bool EVS_CheckAndIncrementSquelchTokens(EVS_AppData_t *AppDataPtr)

if (AppDataPtr->SquelchTokens <= 0)
{
if(AppDataPtr->SquelchedCount < CFE_EVS_MAX_SQUELCHED_COUNT)
if (AppDataPtr->SquelchedCount < CFE_EVS_MAX_SQUELCH_COUNT)
{
AppDataPtr->SquelchedCount++;
}
}
NotSquelched = false;

/*
6 changes: 3 additions & 3 deletions modules/evs/ut-coverage/evs_UT.c
View file
Original file line number Diff line number Diff line change
@@ -1884,8 +1884,8 @@ void Test_Squelching(void)
for (j = 0; j < sizeof(SendEventFuncs) / sizeof(SendEventFuncs[0]); j++)
{
UT_EVS_ResetSquelchCurrentContext();
EVS_GetCurrentContext(&AppDataPtr, NULL);
AppDataPtr->SquelchedCount = CFE_EVS_MAX_SQUELCH_COUNT-CFE_PLATFORM_EVS_MAX_APP_EVENT_BURST;
EVS_GetCurrentContext(&AppDataPtr, NULL);
AppDataPtr->SquelchedCount = CFE_EVS_MAX_SQUELCH_COUNT - CFE_PLATFORM_EVS_MAX_APP_EVENT_BURST;

SnapshotData.Count = 0;
/*
@@ -1956,7 +1956,7 @@ void Test_Squelching(void)
UtAssert_UINT32_EQ(SnapshotData.Count, CFE_PLATFORM_EVS_MAX_APP_EVENT_BURST + 4);
UtAssert_UINT32_EQ(CapturedTlm.Payload.PacketID.EventID, EVENT_ID);
UtAssert_UINT32_EQ(EVS_Retval, CFE_SUCCESS);
UtAssert_UINT32_EQ(AppDataPtr->SquelchedCount, CFE_EVS_MAX_SQUELCH_COUNT);
UtAssert_UINT32_EQ(AppDataPtr->SquelchedCount, CFE_EVS_MAX_SQUELCH_COUNT);
}

UT_EVS_DisableSquelch();