Skip to content

Set Soft trigger back to zero on last loop iteration in CB plugin, to clear busy record. Add unit test to cover this case #605

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
MarkRivers merged 1 commit into from
Sep 5, 2026
+31 −0
Merged

Set Soft trigger back to zero on last loop iteration in CB plugin, to clear busy record. Add unit test to cover this case #605

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
1 change: 1 addition & 0 deletions ADApp/pluginSrc/NDPluginCircularBuff.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ void NDPluginCircularBuff::processCallbacks(NDArray *pArray)
setStringParam(NDCircBuffStatus,
preCount ? "Buffer filling" : "Dropping frames");
} else {
setIntegerParam(NDCircBuffSoftTrigger, 0);
setIntegerParam(NDCircBuffTriggered, 0);
setIntegerParam(NDCircBuffControl, 0);
setStringParam(NDCircBuffStatus, "Acquisition Completed");
Expand Down
30 changes: 30 additions & 0 deletions ADApp/pluginTests/test_NDPluginCircularBuff.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,4 +183,34 @@ BOOST_AUTO_TEST_CASE(test_PreBufferOrder)
BOOST_CHECK_EQUAL(3, ((uint8_t *)ds->arrays[3]->pData)[0]);
}

BOOST_AUTO_TEST_CASE(test_SoftTriggerClearedAfterAcquisition)
{
size_t gotbytes;
cbCalc->write("0", 2, &gotbytes);

const int postTrigger = 5;
cbPreTrigger->write(10);
cbPostTrigger->write(postTrigger);
cbControl->write(1);

size_t dims[2] = {2,5};
NDArray *testArray = arrayPool->alloc(2,dims,NDFloat64,0,NULL);

// Fill the pre-buffer
for (int i = 0; i < 10; i++)
cbProcess(testArray);

// Fire the soft trigger
cbSoftTrigger->write(1);

// Push through the post-trigger frames to complete the acquisition
for (int i = 0; i < postTrigger; i++)
cbProcess(testArray);

// Once the acquisition completes the soft trigger busy record must be cleared
epicsInt32 softTrigger;
cbSoftTrigger->read(&softTrigger);
BOOST_CHECK_EQUAL(softTrigger, 0);
}

BOOST_AUTO_TEST_SUITE_END()
Loading