MonitoredItem FB: TimestampSource property; tests for different sources

Author: Viacheslav Kalenikov

shared/libraries/opcua/opcuashared/include/opcuashared/opcuadatavalue.h

@@ -29,6 +29,7 @@ class OpcUaDataValue : public OpcUaObject<UA_DataValue>
     using OpcUaObject<UA_DataValue>::OpcUaObject;
 
     static uint64_t toUnixTimeUs(UA_DateTime date);
+    static UA_DateTime fromUnixTimeUs(uint64_t date);
 
     const UA_DataValue& getDataValue() const;
 

shared/libraries/opcua/opcuashared/src/opcuadatavalue.cpp

@@ -53,6 +53,13 @@ uint64_t OpcUaDataValue::toUnixTimeUs(UA_DateTime date)
     return static_cast<uint64_t>((date - UA_DATETIME_UNIX_EPOCH) / UA_DATETIME_USEC);
 }
 
+UA_DateTime OpcUaDataValue::fromUnixTimeUs(uint64_t date)
+{
+    if (date == 0)
+        return 0;
+    return static_cast<UA_DateTime>(date * UA_DATETIME_USEC + UA_DATETIME_UNIX_EPOCH);
+}
+
 bool OpcUaDataValue::isInteger() const
 {
     return VariantUtils::IsInteger(this->value.value);

shared/libraries/opcuageneric/opcuageneric_client/include/opcuageneric_client/constants.h

@@ -32,6 +32,7 @@ static constexpr const char* PROPERTY_NAME_OPCUA_NODE_ID_TYPE = "NodeIDType";
 static constexpr const char* PROPERTY_NAME_OPCUA_NODE_ID = "NodeID";
 static constexpr const char* PROPERTY_NAME_OPCUA_NAMESPACE_INDEX = "NamespaceIndex";
 static constexpr const char* PROPERTY_NAME_OPCUA_SAMPLING_INTERVAL = "SamplingInterval";
+static constexpr const char* PROPERTY_NAME_OPCUA_TS_MODE = "TimestampMode";
 // ----------
 
 // Defaults

shared/libraries/opcuageneric/opcuageneric_client/src/opcua_monitored_item_fb_impl.cpp

@@ -131,6 +131,13 @@ FunctionBlockTypePtr OpcUaMonitoredItemFbImpl::CreateType()
         defaultConfig.addProperty(builder.build());
     }
 
+    {
+        auto builder =
+            SelectionPropertyBuilder(PROPERTY_NAME_OPCUA_TS_MODE, List<IString>("None", "ServerTimestamp", "SourceTimestamp"), static_cast<int>(DomainSource::ServerTimestamp))
+                .setDescription("");
+        defaultConfig.addProperty(builder.build());
+    }
+
     const auto fbType =
         FunctionBlockType(GENERIC_OPCUA_MONITORED_ITEM_FB_NAME,
                           GENERIC_OPCUA_MONITORED_ITEM_FB_NAME,
@@ -203,7 +210,16 @@ void OpcUaMonitoredItemFbImpl::readProperties()
         config.samplingInterval = DEFAULT_OPCUA_MIFB_SAMPLING_INTERVAL;
     }
 
-    config.domainSource = DomainSource::ServerTimestamp;
+    const auto tmpDomainSource =
+        readProperty<int, IInteger>(objPtr, PROPERTY_NAME_OPCUA_TS_MODE, static_cast<int>(DomainSource::ServerTimestamp));
+    if (tmpDomainSource < static_cast<int>(DomainSource::_count) && tmpDomainSource >= 0)
+    {
+        config.domainSource = static_cast<DomainSource>(tmpDomainSource);
+    }
+    else
+    {
+        config.domainSource = DomainSource::ServerTimestamp;
+    }
 
     updateStatuses();
 }

shared/libraries/opcuageneric/opcuageneric_client/tests/opcuaservertesthelper.cpp

@@ -233,11 +233,17 @@ void OpcUaServerTestHelper::publishVariable(std::string identifier,
     CheckStatusCodeException(status);
 }
 
-void OpcUaServerTestHelper::writeNode(const OpcUaNodeId& nodeId, const OpcUaVariant& value)
+void OpcUaServerTestHelper::writeValueNode(const OpcUaNodeId& nodeId, const OpcUaVariant& value)
 {
     CheckStatusCodeException(UA_Server_writeValue(server, *nodeId, *value));
 }
 
+void OpcUaServerTestHelper::writeDataValueNode(const OpcUaNodeId& nodeId, const OpcUaDataValue& value)
+{
+    CheckStatusCodeException(UA_Server_writeDataValue(server, *nodeId, *value));
+}
+
+
 void OpcUaServerTestHelper::publishFolder(const char* identifier, UA_NodeId* parentNodeId, const char* locale, int nodeIndex)
 {
     OpcUaObject<UA_ObjectAttributes> attr = UA_ObjectAttributes_default;

shared/libraries/opcuageneric/opcuageneric_client/tests/opcuaservertesthelper.h

@@ -53,7 +53,8 @@ class OpcUaServerTestHelper final
                          uint16_t nodeIndex = 1,
                          size_t dimension = 1);
 
-    void writeNode(const OpcUaNodeId& nodeId, const OpcUaVariant& value);
+    void writeValueNode(const OpcUaNodeId& nodeId, const OpcUaVariant& value);
+    void writeDataValueNode(const OpcUaNodeId& nodeId, const OpcUaDataValue& value);
 
 private:
     void runServer();