Commit eb2e5c92 authored by Ivan Tyagov's avatar Ivan Tyagov

Cleanup.

parent a43f1d4c
...@@ -244,9 +244,7 @@ int main(int argc, char **argv) ...@@ -244,9 +244,7 @@ int main(int argc, char **argv)
UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp"); UA_STRING("http://opcfoundation.org/UA-Profile/Transport/pubsub-udp-uadp");
UA_NetworkAddressUrlDataType networkAddressUrl = UA_NetworkAddressUrlDataType networkAddressUrl =
{UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")}; {UA_STRING_NULL , UA_STRING("opc.udp://224.0.0.22:4840/")};
/*
UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP()); UA_ServerConfig_addPubSubTransportLayer(config, UA_PubSubTransportLayerUDPMP());
addPubSubConnection(server, &transportProfile, &networkAddressUrl); addPubSubConnection(server, &transportProfile, &networkAddressUrl);
addPublishedDataSet(server); addPublishedDataSet(server);
//addDataSetField(server); //addDataSetField(server);
...@@ -256,7 +254,7 @@ int main(int argc, char **argv) ...@@ -256,7 +254,7 @@ int main(int argc, char **argv)
} }
addWriterGroup(server); addWriterGroup(server);
addDataSetWriter(server); addDataSetWriter(server);
*/
// run server // run server
UA_StatusCode retval = UA_Server_run(server, &running); UA_StatusCode retval = UA_Server_run(server, &running);
UA_Server_delete(server); UA_Server_delete(server);
......
...@@ -229,46 +229,23 @@ static void fillTestDataSetMetaData(UA_DataSetMetaDataType *pMetaData) { ...@@ -229,46 +229,23 @@ static void fillTestDataSetMetaData(UA_DataSetMetaDataType *pMetaData) {
} }
UA_DataSetMetaDataType_init (pMetaData); UA_DataSetMetaDataType_init (pMetaData);
pMetaData->name = UA_STRING ("DataSet 1"); pMetaData->name = UA_STRING ("DataSet 1 (subscribed)");
/* Static definition of number of fields size to 4 to create four different /* Static definition of number of fields size to 4 to create four different
* targetVariables of distinct datatype * targetVariables of distinct datatype
* Currently the publisher sends only DateTime data type */ * Currently the publisher sends only DateTime data type */
pMetaData->fieldsSize = 4; pMetaData->fieldsSize = 1;
pMetaData->fields = (UA_FieldMetaData*)UA_Array_new (pMetaData->fieldsSize, pMetaData->fields = (UA_FieldMetaData*)UA_Array_new (pMetaData->fieldsSize,
&UA_TYPES[UA_TYPES_FIELDMETADATA]); &UA_TYPES[UA_TYPES_FIELDMETADATA]);
/* DateTime DataType */ /* DateTime DataType */
UA_FieldMetaData_init (&pMetaData->fields[0]); UA_FieldMetaData_init (&pMetaData->fields[0]);
UA_NodeId_copy (&UA_TYPES[UA_TYPES_DATETIME].typeId, UA_NodeId_copy (&UA_TYPES[UA_TYPES_INT64].typeId,
&pMetaData->fields[0].dataType); &pMetaData->fields[0].dataType);
pMetaData->fields[0].builtInType = UA_NS0ID_DATETIME; pMetaData->fields[0].builtInType = UA_NS0ID_INT64;
pMetaData->fields[0].name = UA_STRING ("DateTime"); pMetaData->fields[0].name = UA_STRING ("Heartbeat (subscribed)");
pMetaData->fields[0].valueRank = -1; /* scalar */ pMetaData->fields[0].valueRank = -1; /* scalar */
/* Int32 DataType */
UA_FieldMetaData_init (&pMetaData->fields[1]);
UA_NodeId_copy(&UA_TYPES[UA_TYPES_INT32].typeId,
&pMetaData->fields[1].dataType);
pMetaData->fields[1].builtInType = UA_NS0ID_INT32;
pMetaData->fields[1].name = UA_STRING ("Int32");
pMetaData->fields[1].valueRank = -1; /* scalar */
/* Int64 DataType */
UA_FieldMetaData_init (&pMetaData->fields[2]);
UA_NodeId_copy(&UA_TYPES[UA_TYPES_INT64].typeId,
&pMetaData->fields[2].dataType);
pMetaData->fields[2].builtInType = UA_NS0ID_INT64;
pMetaData->fields[2].name = UA_STRING ("Int64");
pMetaData->fields[2].valueRank = -1; /* scalar */
/* Boolean DataType */
UA_FieldMetaData_init (&pMetaData->fields[3]);
UA_NodeId_copy (&UA_TYPES[UA_TYPES_BOOLEAN].typeId,
&pMetaData->fields[3].dataType);
pMetaData->fields[3].builtInType = UA_NS0ID_BOOLEAN;
pMetaData->fields[3].name = UA_STRING ("BoolToggle");
pMetaData->fields[3].valueRank = -1; /* scalar */
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment