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

Deadband filter #159

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Deadband filter #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35bc784
implement deadband option
dirk-zimoch Jun 18, 2024
68d76fb
unconditionally show error when monitor item fails
dirk-zimoch Jun 18, 2024
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 devOpcuaSup/UaSdk/ItemUaSdk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ ItemUaSdk::show (int level) const
<< " dataDirty=" << (dataTreeDirty ? "y" : "n")
<< " context=" << linkinfo.subscription << "@" << session->getName()
<< " sampling=" << revisedSamplingInterval << "(" << linkinfo.samplingInterval << ")"
<< " deadband=" << linkinfo.deadband
<< " qsize=" << revisedQueueSize << "(" << linkinfo.queueSize << ")"
<< " cqsize=" << linkinfo.clientQueueSize
<< " discard=" << (linkinfo.discardOldest ? "old" : "new")
Expand Down
32 changes: 22 additions & 10 deletions devOpcuaSup/UaSdk/SubscriptionUaSdk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,19 @@ SubscriptionUaSdk::addMonitoredItems ()
monitoredItemCreateRequests[i].RequestedParameters.SamplingInterval = it->linkinfo.samplingInterval;
monitoredItemCreateRequests[i].RequestedParameters.QueueSize = it->linkinfo.queueSize;
monitoredItemCreateRequests[i].RequestedParameters.DiscardOldest = it->linkinfo.discardOldest;
if (it->linkinfo.deadband > 0.0) {
OpcUa_DataChangeFilter* pDataChangeFilter = NULL;
OpcUa_EncodeableObject_CreateExtension(
&OpcUa_DataChangeFilter_EncodeableType,
&monitoredItemCreateRequests[i].RequestedParameters.Filter,
(OpcUa_Void**)&pDataChangeFilter);
if ( pDataChangeFilter )
{
pDataChangeFilter->DeadbandType = OpcUa_DeadbandType_Absolute;
pDataChangeFilter->DeadbandValue = it->linkinfo.deadband;
pDataChangeFilter->Trigger = OpcUa_DataChangeTrigger_StatusValue;
}
}
i++;
}

Expand All @@ -199,20 +212,19 @@ SubscriptionUaSdk::addMonitoredItems ()
std::cout << "Subscription " << name << "@" << psessionuasdk->getName()
<< ": created " << items.size() << " monitored items ("
<< status.toString().toUtf8() << ")" << std::endl;
if (debug >= 5) {
for (i = 0; i < items.size(); i++) {
UaNodeId node(monitoredItemCreateRequests[i].ItemToMonitor.NodeId);
if (OpcUa_IsGood(monitoredItemCreateResults[i].StatusCode))
std::cout << "** Monitored item " << node.toXmlString().toUtf8()
for (i = 0; i < items.size(); i++) {
if (OpcUa_IsGood(monitoredItemCreateResults[i].StatusCode)) {
if (debug >= 5)
std::cout << "** Monitored item " << UaNodeId(monitoredItemCreateRequests[i].ItemToMonitor.NodeId).toXmlString().toUtf8()
<< " succeeded with id " << monitoredItemCreateResults[i].MonitoredItemId
<< " revised sampling interval " << monitoredItemCreateResults[i].RevisedSamplingInterval
<< " revised queue size " << monitoredItemCreateResults[i].RevisedQueueSize
<< std::endl;
else
std::cout << "** Monitored item " << node.toXmlString().toUtf8()
<< " failed with error "
<< UaStatus(monitoredItemCreateResults[i].StatusCode).toString().toUtf8()
<< std::endl;
} else {
errlogPrintf("OPC UA record %s monitored item %s failed with error %s\n",
items[i]->recConnector->getRecordName(),
UaNodeId(monitoredItemCreateRequests[i].ItemToMonitor.NodeId).toXmlString().toUtf8(),
UaStatus(monitoredItemCreateResults[i].StatusCode).toString().toUtf8());
}
}
}
Expand Down
1 change: 1 addition & 0 deletions devOpcuaSup/devOpcua.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ typedef struct linkInfo {
epicsUInt32 queueSize;
epicsUInt32 clientQueueSize;
bool discardOldest = true;
double deadband = 0;

std::string element;
std::list<std::string> elementPath;
Expand Down
4 changes: 4 additions & 0 deletions devOpcuaSup/linkParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,9 @@ parseLink (dbCommon *prec, const DBEntry &ent)
} else if (pinfo->linkedToItem && optname == "sampling") {
if (epicsParseDouble(optval.c_str(), &pinfo->samplingInterval, nullptr))
throw std::runtime_error(SB() << "error converting '" << optval << "' to Double");
} else if (pinfo->linkedToItem && optname == "deadband") {
if (epicsParseDouble(optval.c_str(), &pinfo->deadband, nullptr))
throw std::runtime_error(SB() << "error converting '" << optval << "' to Double");
} else if (pinfo->linkedToItem && optname == "qsize") {
if (epicsParseUInt32(optval.c_str(), &pinfo->queueSize, 0, nullptr))
throw std::runtime_error(SB() << "error converting '" << optval << "' to UInt32");
Expand Down Expand Up @@ -352,6 +355,7 @@ parseLink (dbCommon *prec, const DBEntry &ent)
else
std::cout << " id(s)=" << pinfo->identifierString;
std::cout << " sampling=" << pinfo->samplingInterval
<< " deadband=" << pinfo->deadband
<< " qsize=" << pinfo->queueSize
<< " cqsize=" << pinfo->clientQueueSize
<< " discard=" << (pinfo->discardOldest ? "old" : "new")
Expand Down
1 change: 1 addition & 0 deletions devOpcuaSup/open62541/ItemOpen62541.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ ItemOpen62541::show (int level) const
<< " dataDirty=" << (dataTreeDirty ? "y" : "n")
<< " context=" << linkinfo.subscription << "@" << session->getName()
<< " sampling=" << revisedSamplingInterval << "(" << linkinfo.samplingInterval << ")"
<< " deadband=" << linkinfo.deadband
<< " qsize=" << revisedQueueSize << "(" << linkinfo.queueSize << ")"
<< " cqsize=" << linkinfo.clientQueueSize
<< " discard=" << (linkinfo.discardOldest ? "old" : "new")
Expand Down
32 changes: 21 additions & 11 deletions devOpcuaSup/open62541/SubscriptionOpen62541.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ SubscriptionOpen62541::addMonitoredItems ()
UA_UInt32 i;
UA_MonitoredItemCreateRequest monitoredItemCreateRequest;
UA_MonitoredItemCreateResult monitoredItemCreateResult;
UA_DataChangeFilter dataChangeFilter;

if (items.size()) {
monitoredItemCreateResult.statusCode = UA_STATUSCODE_GOOD; // suppress compiler warning
Expand All @@ -161,29 +162,38 @@ SubscriptionOpen62541::addMonitoredItems ()
monitoredItemCreateRequest.requestedParameters.samplingInterval = it->linkinfo.samplingInterval;
monitoredItemCreateRequest.requestedParameters.queueSize = it->linkinfo.queueSize;
monitoredItemCreateRequest.requestedParameters.discardOldest = it->linkinfo.discardOldest;
if (it->linkinfo.deadband > 0.0) {
UA_DataChangeFilter_init(&dataChangeFilter);
dataChangeFilter.deadbandType = UA_DEADBANDTYPE_ABSOLUTE;
dataChangeFilter.deadbandValue = it->linkinfo.deadband;
dataChangeFilter.trigger = UA_DATACHANGETRIGGER_STATUSVALUE;
UA_ExtensionObject *filter = &monitoredItemCreateRequest.requestedParameters.filter;
filter->content.decoded.data = &dataChangeFilter;
filter->content.decoded.type = &UA_TYPES[UA_TYPES_DATACHANGEFILTER];
filter->encoding = UA_EXTENSIONOBJECT_DECODED;
}
monitoredItemCreateResult = UA_Client_MonitoredItems_createDataChange(
session.client, subscriptionSettings.subscriptionId, UA_TIMESTAMPSTORETURN_BOTH,
monitoredItemCreateRequest, items[i], [] (UA_Client *client, UA_UInt32 subId, void *subContext,
monitoredItemCreateRequest, it, [] (UA_Client *client, UA_UInt32 subId, void *subContext,
UA_UInt32 monId, void *monContext, UA_DataValue *value) {
static_cast<SubscriptionOpen62541*>(subContext)->
dataChange(monId, *static_cast<ItemOpen62541*>(monContext), value);
}, nullptr /* deleteCallback */);
if (monitoredItemCreateResult.statusCode == UA_STATUSCODE_GOOD) {
items[i]->setRevisedSamplingInterval(monitoredItemCreateResult.revisedSamplingInterval);
items[i]->setRevisedQueueSize(monitoredItemCreateResult.revisedQueueSize);
}
if (debug >= 5) {
if (monitoredItemCreateResult.statusCode == UA_STATUSCODE_GOOD)
it->setRevisedSamplingInterval(monitoredItemCreateResult.revisedSamplingInterval);
it->setRevisedQueueSize(monitoredItemCreateResult.revisedQueueSize);
if (debug >= 5) {
std::cout << "** Monitored item " << monitoredItemCreateRequest.itemToMonitor.nodeId
<< " succeeded with id " << monitoredItemCreateResult.monitoredItemId
<< " revised sampling interval " << monitoredItemCreateResult.revisedSamplingInterval
<< " revised queue size " << monitoredItemCreateResult.revisedQueueSize
<< std::endl;
else
std::cout << "** Monitored item " << monitoredItemCreateRequest.itemToMonitor.nodeId
<< " failed with error "
<< UA_StatusCode_name(monitoredItemCreateResult.statusCode)
<< std::endl;
}
} else {
std::cerr << "OPC UA record " << it->recConnector->getRecordName()
<< " monitored item " << monitoredItemCreateRequest.itemToMonitor.nodeId
<< " failed with error " << UA_StatusCode_name(monitoredItemCreateResult.statusCode)
<< std::endl;
}
i++;
}
Expand Down
Loading