Support for Enums, OptStructs and Unions (+ bugfixes)

.ci-local/install-open62541.py

@@ -86,9 +86,6 @@
     if cue.ci['static']:
         build_shared = 'OFF'
 
-    if ver[0] == '1' and ver[1] == '3':
-        sp.check_call(['patch', '-p1', '-i', os.path.join(curdir, '.ci-local', 'open62541-1.3.patch')], cwd=sdkdir)
-
     sp.check_call(['cmake', '..',
                    '-G', generator,
                    '-DBUILD_SHARED_LIBS={0}'.format(build_shared),

devOpcuaSup/DataElement.h

@@ -13,6 +13,7 @@
 #ifndef DEVOPCUA_DATAELEMENT_H
 #define DEVOPCUA_DATAELEMENT_H
 
+#include <map>
 #include <vector>
 #include <memory>
 #include <cstring>
@@ -24,6 +25,8 @@
 
 namespace DevOpcua {
 
+typedef std::map<epicsUInt32, std::string> EnumChoices;
+
 class RecordConnector;
 
 /**
@@ -795,6 +798,7 @@ class DataElement
     virtual void requestRecordProcessing(const ProcessReason reason) const = 0;
 
     const std::string name;                     /**< element name */
+    const EnumChoices* enumChoices = nullptr;   /**< enum definition if this element is an enum */
 
 protected:
     /**

devOpcuaSup/RecordConnector.cpp

@@ -33,6 +33,7 @@
 #include <dbStaticLib.h>
 #include <errlog.h>
 #include <alarm.h>
+#include <epicsVersion.h>
 
 #define epicsExportSharedSymbols
 #include "RecordConnector.h"
@@ -76,6 +77,16 @@ long reProcess (dbCommon *prec)
     return status;
 }
 
+#if EPICS_VERSION_INT >= VERSION_INT(3,16,0,1)
+#define SAVE_FLNK(prec) struct lset *lset = prec->flnk.lset
+#define DISABLE_FLNK(prec) prec->flnk.lset = NULL
+#define RESTORE_FLNK(prec) prec->flnk.lset = lset
+#else
+#define SAVE_FLNK(prec) short type = prec->flnk.type
+#define DISABLE_FLNK(prec) prec->flnk.type = 0
+#define RESTORE_FLNK(prec) prec->flnk.type = type
+#endif
+
 void processCallback (epicsCallback *pcallback, const ProcessReason reason)
 {
     void *pUsr;
@@ -85,14 +96,25 @@ void processCallback (epicsCallback *pcallback, const ProcessReason reason)
     prec = static_cast<dbCommon *>(pUsr);
     if (!prec || !prec->dpvt) return;
 
+    // Do not process writeComplete on struct elements that have not been written
+    if (reason == writeComplete && !prec->pact)
+        return;
+
     RecordConnector *pvt = static_cast<RecordConnector*>(prec->dpvt);
     dbScanLock(prec);
     ProcessReason oldreason = pvt->reason;
     pvt->reason = reason;
+
+    // Do not process FLNK on updates if not "I/O Intr"
+    SAVE_FLNK(prec);
+    if (reason != writeComplete && prec->scan != menuScanI_O_Intr)
+        DISABLE_FLNK(prec);
     if (prec->pact)
         reProcess(prec);
     else
         dbProcess(prec);
+    RESTORE_FLNK(prec);
+
     pvt->reason = oldreason;
     dbScanUnlock(prec);
 }