implement deadband option

epics-modules · Sep 9, 2024 · 35bc784 · 35bc784
1 parent 6abbc20
commit 35bc784
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 0 deletions.
diff --git a/devOpcuaSup/UaSdk/ItemUaSdk.cpp b/devOpcuaSup/UaSdk/ItemUaSdk.cpp
@@ -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")

diff --git a/devOpcuaSup/UaSdk/SubscriptionUaSdk.cpp b/devOpcuaSup/UaSdk/SubscriptionUaSdk.cpp
@@ -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++;
         }
 

diff --git a/devOpcuaSup/devOpcua.h b/devOpcuaSup/devOpcua.h
@@ -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;

diff --git a/devOpcuaSup/linkParser.cpp b/devOpcuaSup/linkParser.cpp
@@ -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");
@@ -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")

diff --git a/devOpcuaSup/open62541/ItemOpen62541.cpp b/devOpcuaSup/open62541/ItemOpen62541.cpp
@@ -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")

diff --git a/devOpcuaSup/open62541/SubscriptionOpen62541.cpp b/devOpcuaSup/open62541/SubscriptionOpen62541.cpp
@@ -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
@@ -161,6 +162,16 @@ 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,