|
@@ -125,8 +125,8 @@ int main(int argc, char** argv) {
|
|
/* add a static variable node to the server */
|
|
/* add a static variable node to the server */
|
|
UA_VariableAttributes myVar;
|
|
UA_VariableAttributes myVar;
|
|
UA_VariableAttributes_init(&myVar);
|
|
UA_VariableAttributes_init(&myVar);
|
|
- myVar.description = UA_LOCALIZEDTEXT("en_US", "the answer");
|
|
|
|
- myVar.displayName = UA_LOCALIZEDTEXT("en_US", "the answer");
|
|
|
|
|
|
+ myVar.description = UA_LOCALIZEDTEXT("en-US", "the answer");
|
|
|
|
+ myVar.displayName = UA_LOCALIZEDTEXT("en-US", "the answer");
|
|
myVar.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
|
|
myVar.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
|
|
UA_Int32 myInteger = 42;
|
|
UA_Int32 myInteger = 42;
|
|
UA_Variant_setScalarCopy(&myVar.value, &myInteger, &UA_TYPES[UA_TYPES_INT32]);
|
|
UA_Variant_setScalarCopy(&myVar.value, &myInteger, &UA_TYPES[UA_TYPES_INT32]);
|
|
@@ -144,8 +144,8 @@ int main(int argc, char** argv) {
|
|
dateDataSource.write = NULL;
|
|
dateDataSource.write = NULL;
|
|
UA_VariableAttributes v_attr;
|
|
UA_VariableAttributes v_attr;
|
|
UA_VariableAttributes_init(&v_attr);
|
|
UA_VariableAttributes_init(&v_attr);
|
|
- v_attr.description = UA_LOCALIZEDTEXT("en_US","current time");
|
|
|
|
- v_attr.displayName = UA_LOCALIZEDTEXT("en_US","current time");
|
|
|
|
|
|
+ v_attr.description = UA_LOCALIZEDTEXT("en-US","current time");
|
|
|
|
+ v_attr.displayName = UA_LOCALIZEDTEXT("en-US","current time");
|
|
v_attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
|
|
v_attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
|
|
const UA_QualifiedName dateName = UA_QUALIFIEDNAME(1, "current time");
|
|
const UA_QualifiedName dateName = UA_QUALIFIEDNAME(1, "current time");
|
|
UA_NodeId dataSourceId;
|
|
UA_NodeId dataSourceId;
|
|
@@ -159,7 +159,7 @@ int main(int argc, char** argv) {
|
|
UA_Argument inputArguments;
|
|
UA_Argument inputArguments;
|
|
UA_Argument_init(&inputArguments);
|
|
UA_Argument_init(&inputArguments);
|
|
inputArguments.dataType = UA_TYPES[UA_TYPES_STRING].typeId;
|
|
inputArguments.dataType = UA_TYPES[UA_TYPES_STRING].typeId;
|
|
- inputArguments.description = UA_LOCALIZEDTEXT("en_US", "Say your name");
|
|
|
|
|
|
+ inputArguments.description = UA_LOCALIZEDTEXT("en-US", "Say your name");
|
|
inputArguments.name = UA_STRING("Name");
|
|
inputArguments.name = UA_STRING("Name");
|
|
inputArguments.valueRank = -1; /* scalar argument */
|
|
inputArguments.valueRank = -1; /* scalar argument */
|
|
|
|
|
|
@@ -168,13 +168,13 @@ int main(int argc, char** argv) {
|
|
outputArguments.arrayDimensionsSize = 0;
|
|
outputArguments.arrayDimensionsSize = 0;
|
|
outputArguments.arrayDimensions = NULL;
|
|
outputArguments.arrayDimensions = NULL;
|
|
outputArguments.dataType = UA_TYPES[UA_TYPES_STRING].typeId;
|
|
outputArguments.dataType = UA_TYPES[UA_TYPES_STRING].typeId;
|
|
- outputArguments.description = UA_LOCALIZEDTEXT("en_US", "Receive a greeting");
|
|
|
|
|
|
+ outputArguments.description = UA_LOCALIZEDTEXT("en-US", "Receive a greeting");
|
|
outputArguments.name = UA_STRING("greeting");
|
|
outputArguments.name = UA_STRING("greeting");
|
|
outputArguments.valueRank = -1;
|
|
outputArguments.valueRank = -1;
|
|
|
|
|
|
UA_MethodAttributes addmethodattributes;
|
|
UA_MethodAttributes addmethodattributes;
|
|
UA_MethodAttributes_init(&addmethodattributes);
|
|
UA_MethodAttributes_init(&addmethodattributes);
|
|
- addmethodattributes.displayName = UA_LOCALIZEDTEXT("en_US", "Hello World");
|
|
|
|
|
|
+ addmethodattributes.displayName = UA_LOCALIZEDTEXT("en-US", "Hello World");
|
|
addmethodattributes.executable = true;
|
|
addmethodattributes.executable = true;
|
|
addmethodattributes.userExecutable = true;
|
|
addmethodattributes.userExecutable = true;
|
|
UA_Server_addMethodNode(server, UA_NODEID_NUMERIC(1, 62541),
|
|
UA_Server_addMethodNode(server, UA_NODEID_NUMERIC(1, 62541),
|
|
@@ -194,29 +194,29 @@ int main(int argc, char** argv) {
|
|
|
|
|
|
UA_ObjectAttributes object_attr;
|
|
UA_ObjectAttributes object_attr;
|
|
UA_ObjectAttributes_init(&object_attr);
|
|
UA_ObjectAttributes_init(&object_attr);
|
|
- object_attr.description = UA_LOCALIZEDTEXT("en_US", "Demo");
|
|
|
|
- object_attr.displayName = UA_LOCALIZEDTEXT("en_US", "Demo");
|
|
|
|
|
|
+ object_attr.description = UA_LOCALIZEDTEXT("en-US", "Demo");
|
|
|
|
+ object_attr.displayName = UA_LOCALIZEDTEXT("en-US", "Demo");
|
|
UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, DEMOID),
|
|
UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, DEMOID),
|
|
UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
|
|
UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER),
|
|
UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), UA_QUALIFIEDNAME(1, "Demo"),
|
|
UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), UA_QUALIFIEDNAME(1, "Demo"),
|
|
UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
|
|
UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
|
|
|
|
|
|
- object_attr.description = UA_LOCALIZEDTEXT("en_US", "Scalar");
|
|
|
|
- object_attr.displayName = UA_LOCALIZEDTEXT("en_US", "Scalar");
|
|
|
|
|
|
+ object_attr.description = UA_LOCALIZEDTEXT("en-US", "Scalar");
|
|
|
|
+ object_attr.displayName = UA_LOCALIZEDTEXT("en-US", "Scalar");
|
|
UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, SCALARID),
|
|
UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, SCALARID),
|
|
UA_NODEID_NUMERIC(1, DEMOID), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
|
|
UA_NODEID_NUMERIC(1, DEMOID), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
|
|
UA_QUALIFIEDNAME(1, "Scalar"),
|
|
UA_QUALIFIEDNAME(1, "Scalar"),
|
|
UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
|
|
UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
|
|
|
|
|
|
- object_attr.description = UA_LOCALIZEDTEXT("en_US", "Array");
|
|
|
|
- object_attr.displayName = UA_LOCALIZEDTEXT("en_US", "Array");
|
|
|
|
|
|
+ object_attr.description = UA_LOCALIZEDTEXT("en-US", "Array");
|
|
|
|
+ object_attr.displayName = UA_LOCALIZEDTEXT("en-US", "Array");
|
|
UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, ARRAYID),
|
|
UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, ARRAYID),
|
|
UA_NODEID_NUMERIC(1, DEMOID), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
|
|
UA_NODEID_NUMERIC(1, DEMOID), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
|
|
UA_QUALIFIEDNAME(1, "Array"),
|
|
UA_QUALIFIEDNAME(1, "Array"),
|
|
UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
|
|
UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
|
|
|
|
|
|
- object_attr.description = UA_LOCALIZEDTEXT("en_US", "Matrix");
|
|
|
|
- object_attr.displayName = UA_LOCALIZEDTEXT("en_US", "Matrix");
|
|
|
|
|
|
+ object_attr.description = UA_LOCALIZEDTEXT("en-US", "Matrix");
|
|
|
|
+ object_attr.displayName = UA_LOCALIZEDTEXT("en-US", "Matrix");
|
|
UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, MATRIXID), UA_NODEID_NUMERIC(1, DEMOID),
|
|
UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, MATRIXID), UA_NODEID_NUMERIC(1, DEMOID),
|
|
UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), UA_QUALIFIEDNAME(1, "Matrix"),
|
|
UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), UA_QUALIFIEDNAME(1, "Matrix"),
|
|
UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
|
|
UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE), object_attr, NULL, NULL);
|
|
@@ -238,10 +238,10 @@ int main(int argc, char** argv) {
|
|
#else
|
|
#else
|
|
sprintf(name, "%02d", type);
|
|
sprintf(name, "%02d", type);
|
|
#endif
|
|
#endif
|
|
- attr.displayName = UA_LOCALIZEDTEXT("en_US", name);
|
|
|
|
|
|
+ attr.displayName = UA_LOCALIZEDTEXT("en-US", name);
|
|
UA_QualifiedName qualifiedName = UA_QUALIFIEDNAME(1, name);
|
|
UA_QualifiedName qualifiedName = UA_QUALIFIEDNAME(1, name);
|
|
#else
|
|
#else
|
|
- attr.displayName = UA_LOCALIZEDTEXT_ALLOC("en_US", UA_TYPES[type].typeName);
|
|
|
|
|
|
+ attr.displayName = UA_LOCALIZEDTEXT_ALLOC("en-US", UA_TYPES[type].typeName);
|
|
UA_QualifiedName qualifiedName = UA_QUALIFIEDNAME_ALLOC(1, UA_TYPES[type].typeName);
|
|
UA_QualifiedName qualifiedName = UA_QUALIFIEDNAME_ALLOC(1, UA_TYPES[type].typeName);
|
|
#endif
|
|
#endif
|
|
attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
|
|
attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
|
|
@@ -285,8 +285,8 @@ int main(int argc, char** argv) {
|
|
/* Hierarchy of depth 10 for CTT testing with forward and inverse references */
|
|
/* Hierarchy of depth 10 for CTT testing with forward and inverse references */
|
|
/* Enter node "depth 9" in CTT configuration - Project->Settings->Server
|
|
/* Enter node "depth 9" in CTT configuration - Project->Settings->Server
|
|
Test->NodeIds->Paths->Starting Node 1 */
|
|
Test->NodeIds->Paths->Starting Node 1 */
|
|
- object_attr.description = UA_LOCALIZEDTEXT("en_US","DepthDemo");
|
|
|
|
- object_attr.displayName = UA_LOCALIZEDTEXT("en_US","DepthDemo");
|
|
|
|
|
|
+ object_attr.description = UA_LOCALIZEDTEXT("en-US","DepthDemo");
|
|
|
|
+ object_attr.displayName = UA_LOCALIZEDTEXT("en-US","DepthDemo");
|
|
UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, DEPTHID),
|
|
UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, DEPTHID),
|
|
UA_NODEID_NUMERIC(1, DEMOID),
|
|
UA_NODEID_NUMERIC(1, DEMOID),
|
|
UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), UA_QUALIFIEDNAME(1, "DepthDemo"),
|
|
UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), UA_QUALIFIEDNAME(1, "DepthDemo"),
|
|
@@ -300,8 +300,8 @@ int main(int argc, char** argv) {
|
|
#else
|
|
#else
|
|
sprintf(name, "depth%i", i);
|
|
sprintf(name, "depth%i", i);
|
|
#endif
|
|
#endif
|
|
- object_attr.description = UA_LOCALIZEDTEXT("en_US",name);
|
|
|
|
- object_attr.displayName = UA_LOCALIZEDTEXT("en_US",name);
|
|
|
|
|
|
+ object_attr.description = UA_LOCALIZEDTEXT("en-US",name);
|
|
|
|
+ object_attr.displayName = UA_LOCALIZEDTEXT("en-US",name);
|
|
UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, id+i),
|
|
UA_Server_addObjectNode(server, UA_NODEID_NUMERIC(1, id+i),
|
|
UA_NODEID_NUMERIC(1, i==1 ? DEPTHID : id+i-1), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
|
|
UA_NODEID_NUMERIC(1, i==1 ? DEPTHID : id+i-1), UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES),
|
|
UA_QUALIFIEDNAME(1, name),
|
|
UA_QUALIFIEDNAME(1, name),
|
|
@@ -316,7 +316,7 @@ int main(int argc, char** argv) {
|
|
UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), answer_nodeid, true);
|
|
UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES), answer_nodeid, true);
|
|
|
|
|
|
/* Example for manually setting an attribute within the server */
|
|
/* Example for manually setting an attribute within the server */
|
|
- UA_LocalizedText objectsName = UA_LOCALIZEDTEXT("en_US", "Objects");
|
|
|
|
|
|
+ UA_LocalizedText objectsName = UA_LOCALIZEDTEXT("en-US", "Objects");
|
|
UA_Server_writeDisplayName(server, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER), objectsName);
|
|
UA_Server_writeDisplayName(server, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER), objectsName);
|
|
|
|
|
|
#define NOARGID 60000
|
|
#define NOARGID 60000
|
|
@@ -327,7 +327,7 @@ int main(int argc, char** argv) {
|
|
/* adding some more method nodes to pass CTT */
|
|
/* adding some more method nodes to pass CTT */
|
|
/* Method without arguments */
|
|
/* Method without arguments */
|
|
UA_MethodAttributes_init(&addmethodattributes);
|
|
UA_MethodAttributes_init(&addmethodattributes);
|
|
- addmethodattributes.displayName = UA_LOCALIZEDTEXT("en_US", "noarg");
|
|
|
|
|
|
+ addmethodattributes.displayName = UA_LOCALIZEDTEXT("en-US", "noarg");
|
|
addmethodattributes.executable = true;
|
|
addmethodattributes.executable = true;
|
|
addmethodattributes.userExecutable = true;
|
|
addmethodattributes.userExecutable = true;
|
|
UA_Server_addMethodNode(server, UA_NODEID_NUMERIC(1, NOARGID),
|
|
UA_Server_addMethodNode(server, UA_NODEID_NUMERIC(1, NOARGID),
|
|
@@ -339,13 +339,13 @@ int main(int argc, char** argv) {
|
|
|
|
|
|
/* Method with in arguments */
|
|
/* Method with in arguments */
|
|
UA_MethodAttributes_init(&addmethodattributes);
|
|
UA_MethodAttributes_init(&addmethodattributes);
|
|
- addmethodattributes.displayName = UA_LOCALIZEDTEXT("en_US", "inarg");
|
|
|
|
|
|
+ addmethodattributes.displayName = UA_LOCALIZEDTEXT("en-US", "inarg");
|
|
addmethodattributes.executable = true;
|
|
addmethodattributes.executable = true;
|
|
addmethodattributes.userExecutable = true;
|
|
addmethodattributes.userExecutable = true;
|
|
|
|
|
|
UA_Argument_init(&inputArguments);
|
|
UA_Argument_init(&inputArguments);
|
|
inputArguments.dataType = UA_TYPES[UA_TYPES_INT32].typeId;
|
|
inputArguments.dataType = UA_TYPES[UA_TYPES_INT32].typeId;
|
|
- inputArguments.description = UA_LOCALIZEDTEXT("en_US", "Input");
|
|
|
|
|
|
+ inputArguments.description = UA_LOCALIZEDTEXT("en-US", "Input");
|
|
inputArguments.name = UA_STRING("Input");
|
|
inputArguments.name = UA_STRING("Input");
|
|
inputArguments.valueRank = -1; //uaexpert will crash if set to 0 ;)
|
|
inputArguments.valueRank = -1; //uaexpert will crash if set to 0 ;)
|
|
|
|
|
|
@@ -358,13 +358,13 @@ int main(int argc, char** argv) {
|
|
|
|
|
|
/* Method with out arguments */
|
|
/* Method with out arguments */
|
|
UA_MethodAttributes_init(&addmethodattributes);
|
|
UA_MethodAttributes_init(&addmethodattributes);
|
|
- addmethodattributes.displayName = UA_LOCALIZEDTEXT("en_US", "outarg");
|
|
|
|
|
|
+ addmethodattributes.displayName = UA_LOCALIZEDTEXT("en-US", "outarg");
|
|
addmethodattributes.executable = true;
|
|
addmethodattributes.executable = true;
|
|
addmethodattributes.userExecutable = true;
|
|
addmethodattributes.userExecutable = true;
|
|
|
|
|
|
UA_Argument_init(&outputArguments);
|
|
UA_Argument_init(&outputArguments);
|
|
outputArguments.dataType = UA_TYPES[UA_TYPES_INT32].typeId;
|
|
outputArguments.dataType = UA_TYPES[UA_TYPES_INT32].typeId;
|
|
- outputArguments.description = UA_LOCALIZEDTEXT("en_US", "Output");
|
|
|
|
|
|
+ outputArguments.description = UA_LOCALIZEDTEXT("en-US", "Output");
|
|
outputArguments.name = UA_STRING("Output");
|
|
outputArguments.name = UA_STRING("Output");
|
|
outputArguments.valueRank = -1;
|
|
outputArguments.valueRank = -1;
|
|
|
|
|
|
@@ -377,7 +377,7 @@ int main(int argc, char** argv) {
|
|
|
|
|
|
/* Method with inout arguments */
|
|
/* Method with inout arguments */
|
|
UA_MethodAttributes_init(&addmethodattributes);
|
|
UA_MethodAttributes_init(&addmethodattributes);
|
|
- addmethodattributes.displayName = UA_LOCALIZEDTEXT("en_US", "inoutarg");
|
|
|
|
|
|
+ addmethodattributes.displayName = UA_LOCALIZEDTEXT("en-US", "inoutarg");
|
|
addmethodattributes.executable = true;
|
|
addmethodattributes.executable = true;
|
|
addmethodattributes.userExecutable = true;
|
|
addmethodattributes.userExecutable = true;
|
|
|
|
|