Skip to content

Fix #8, do not update LastFalseToTrue + LastTrueToFalse when transitioning from STALE #115

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

Open
thnkslprpt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix #8, do not update LastFalseToTrue + LastTrueToFalse when transitioning from STALE #115

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
4 changes: 2 additions & 2 deletions fsw/src/lc_watch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ void LC_ProcessWP(uint16 WatchIndex, const CFE_SB_Buffer_t *BufPtr, CFE_TIME_Sys
StaleCounter = LC_OperData.WDTPtr[WatchIndex].ResultAgeWhenStale;
LC_OperData.WRTPtr[WatchIndex].CountdownToStale = StaleCounter;

if ((PreviousResult == LC_WATCH_FALSE) || (PreviousResult == LC_WATCH_STALE))
if (PreviousResult == LC_WATCH_FALSE)
{
LC_OperData.WRTPtr[WatchIndex].LastFalseToTrue.DataType = LC_OperData.WDTPtr[WatchIndex].DataType;

Expand All @@ -428,7 +428,7 @@ void LC_ProcessWP(uint16 WatchIndex, const CFE_SB_Buffer_t *BufPtr, CFE_TIME_Sys
StaleCounter = LC_OperData.WDTPtr[WatchIndex].ResultAgeWhenStale;
LC_OperData.WRTPtr[WatchIndex].CountdownToStale = StaleCounter;

if ((PreviousResult == LC_WATCH_TRUE) || (PreviousResult == LC_WATCH_STALE))
if (PreviousResult == LC_WATCH_TRUE)
{
LC_OperData.WRTPtr[WatchIndex].LastTrueToFalse.DataType = LC_OperData.WDTPtr[WatchIndex].DataType;

Expand Down
43 changes: 28 additions & 15 deletions unit-test/lc_watch_tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,11 @@ void LC_ProcessWP_Test_OperatorCompareWatchTruePreviousStale(void)
LC_OperData.WDTPtr[WatchIndex].ComparisonValue.Signed8 = 1;
LC_OperData.WRTPtr[WatchIndex].EvaluationCount = 0;

/* Initialize LastFalseToTrue to verify that it doesn't get modified */
LC_OperData.WRTPtr[WatchIndex].LastFalseToTrue.Value = 0xCC;
LC_OperData.WRTPtr[WatchIndex].LastFalseToTrue.Timestamp.Seconds = 55;
LC_OperData.WRTPtr[WatchIndex].LastFalseToTrue.Timestamp.Subseconds = 44;

/* Execute the function being tested */
LC_ProcessWP(WatchIndex, &UT_CmdBuf.Buf, Timestamp);

Expand All @@ -437,14 +442,16 @@ void LC_ProcessWP_Test_OperatorCompareWatchTruePreviousStale(void)
UtAssert_True(LC_OperData.WRTPtr[WatchIndex].CountdownToStale == 1,
"LC_OperData.WRTPtr[WatchIndex].CountdownToStale == 1");

UtAssert_True(LC_OperData.WRTPtr[WatchIndex].FalseToTrueCount == 1,
"LC_OperData.WRTPtr[WatchIndex].FalseToTrueCount == 1");
UtAssert_True(LC_OperData.WRTPtr[WatchIndex].LastFalseToTrue.Value == 0,
"LC_OperData.WRTPtr[WatchIndex].LastFalseToTrue.Value == 0");
UtAssert_True(LC_OperData.WRTPtr[WatchIndex].LastFalseToTrue.Timestamp.Seconds == 3,
"LC_OperData.WRTPtr[WatchIndex].LastFalseToTrue.Timestamp.Seconds == 3");
UtAssert_True(LC_OperData.WRTPtr[WatchIndex].LastFalseToTrue.Timestamp.Subseconds == 5,
"LC_OperData.WRTPtr[WatchIndex].LastFalseToTrue.Timestamp.Subseconds == 5");
UtAssert_True(LC_OperData.WRTPtr[WatchIndex].FalseToTrueCount == 0,
"LC_OperData.WRTPtr[WatchIndex].FalseToTrueCount == 0");

/* Verify that LastFalseToTrue Value and Timestamp weren't modified */
UtAssert_True(LC_OperData.WRTPtr[WatchIndex].LastFalseToTrue.Value == 0xCC,
"LC_OperData.WRTPtr[WatchIndex].LastFalseToTrue.Value == 0xCC (unchanged)");
UtAssert_True(LC_OperData.WRTPtr[WatchIndex].LastFalseToTrue.Timestamp.Seconds == 55,
"LC_OperData.WRTPtr[WatchIndex].LastFalseToTrue.Timestamp.Seconds == 55 (unchanged)");
UtAssert_True(LC_OperData.WRTPtr[WatchIndex].LastFalseToTrue.Timestamp.Subseconds == 44,
"LC_OperData.WRTPtr[WatchIndex].LastFalseToTrue.Timestamp.Subseconds == 44 (unchanged)");

UtAssert_True(UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)) == 0, "UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)) == 0");
}
Expand Down Expand Up @@ -500,10 +507,10 @@ void LC_ProcessWP_Test_OperatorCompareWatchFalsePreviousStale(void)
{
uint16 WatchIndex = 0;
CFE_TIME_SysTime_t Timestamp;
CFE_SB_MsgId_t TestMsgId = LC_UT_MID_1;

Timestamp.Seconds = 3;
Timestamp.Subseconds = 5;
CFE_SB_MsgId_t TestMsgId = LC_UT_MID_1;

UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);

Expand All @@ -515,6 +522,11 @@ void LC_ProcessWP_Test_OperatorCompareWatchFalsePreviousStale(void)
LC_OperData.WDTPtr[WatchIndex].ComparisonValue.Signed8 = 1;
LC_OperData.WRTPtr[WatchIndex].EvaluationCount = 0;

/* Initialize LastTrueToFalse to verify that it doesn't get modified */
LC_OperData.WRTPtr[WatchIndex].LastTrueToFalse.Value = 0xBB;
LC_OperData.WRTPtr[WatchIndex].LastTrueToFalse.Timestamp.Seconds = 77;
LC_OperData.WRTPtr[WatchIndex].LastTrueToFalse.Timestamp.Subseconds = 66;

/* Execute the function being tested */
LC_ProcessWP(WatchIndex, &UT_CmdBuf.Buf, Timestamp);

Expand All @@ -529,12 +541,13 @@ void LC_ProcessWP_Test_OperatorCompareWatchFalsePreviousStale(void)
UtAssert_True(LC_OperData.WRTPtr[WatchIndex].CountdownToStale == 1,
"LC_OperData.WRTPtr[WatchIndex].CountdownToStale == 1");

UtAssert_True(LC_OperData.WRTPtr[WatchIndex].LastTrueToFalse.Value == 0,
"LC_OperData.WRTPtr[WatchIndex].LastTrueToFalse.Value == 0");
UtAssert_True(LC_OperData.WRTPtr[WatchIndex].LastTrueToFalse.Timestamp.Seconds == 3,
"LC_OperData.WRTPtr[WatchIndex].LastTrueToFalse.Timestamp.Seconds == 3");
UtAssert_True(LC_OperData.WRTPtr[WatchIndex].LastTrueToFalse.Timestamp.Subseconds == 5,
"LC_OperData.WRTPtr[WatchIndex].LastTrueToFalse.Timestamp.Subseconds == 5");
/* Verify that LastTrueToFalse Value and Timestamp weren't modified */
UtAssert_True(LC_OperData.WRTPtr[WatchIndex].LastTrueToFalse.Value == 0xBB,
"LC_OperData.WRTPtr[WatchIndex].LastTrueToFalse.Value == 0xBB (unchanged)");
UtAssert_True(LC_OperData.WRTPtr[WatchIndex].LastTrueToFalse.Timestamp.Seconds == 77,
"LC_OperData.WRTPtr[WatchIndex].LastTrueToFalse.Timestamp.Seconds == 77 (unchanged)");
UtAssert_True(LC_OperData.WRTPtr[WatchIndex].LastTrueToFalse.Timestamp.Subseconds == 66,
"LC_OperData.WRTPtr[WatchIndex].LastTrueToFalse.Timestamp.Subseconds == 66 (unchanged)");

UtAssert_True(UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)) == 0, "UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)) == 0");
}
Expand Down
Loading