Quellcode durchsuchen

Merge pull request #1067 from open62541/hotfix/uinteger_inside_integer

Update to schema version 1.03
Stefan Profanter vor 7 Jahren
Ursprung
Commit
4e743307f4

+ 3 - 2
src/server/ua_server_ns0.c

@@ -293,7 +293,7 @@ void UA_Server_createNS0(UA_Server *server) {
     hassubtype_attr.displayName = UA_LOCALIZEDTEXT("en_US", "HasSubtype");
     hassubtype_attr.isAbstract = false;
     hassubtype_attr.symmetric = false;
-    hassubtype_attr.inverseName = UA_LOCALIZEDTEXT("en_US", "HasSupertype");
+    hassubtype_attr.inverseName = UA_LOCALIZEDTEXT("en_US", "SubtypeOf");
     UA_Server_addReferenceTypeNode_begin(server, UA_NODEID_NUMERIC(0, UA_NS0ID_HASSUBTYPE),
                                          UA_QUALIFIEDNAME(0, "HasSubtype"), hassubtype_attr, NULL);
 
@@ -369,11 +369,12 @@ void UA_Server_createNS0(UA_Server *server) {
     addDataTypeNode(server, "Int16", UA_NS0ID_INT16, false, UA_NS0ID_INTEGER);
     addDataTypeNode(server, "Int32", UA_NS0ID_INT32, false, UA_NS0ID_INTEGER);
     addDataTypeNode(server, "Int64", UA_NS0ID_INT64, false, UA_NS0ID_INTEGER);
-    addDataTypeNode(server, "UInteger", UA_NS0ID_UINTEGER, true, UA_NS0ID_INTEGER);
+    addDataTypeNode(server, "UInteger", UA_NS0ID_UINTEGER, true, UA_NS0ID_NUMBER);
     addDataTypeNode(server, "Byte", UA_NS0ID_BYTE, false, UA_NS0ID_UINTEGER);
     addDataTypeNode(server, "UInt16", UA_NS0ID_UINT16, false, UA_NS0ID_UINTEGER);
     addDataTypeNode(server, "UInt32", UA_NS0ID_UINT32, false, UA_NS0ID_UINTEGER);
     addDataTypeNode(server, "UInt64", UA_NS0ID_UINT64, false, UA_NS0ID_UINTEGER);
+    addDataTypeNode(server, "Decimal128", UA_NS0ID_DECIMAL128, false, UA_NS0ID_NUMBER);
     addDataTypeNode(server, "String", UA_NS0ID_STRING, false, UA_NS0ID_BASEDATATYPE);
     addDataTypeNode(server, "DateTime", UA_NS0ID_DATETIME, false, UA_NS0ID_BASEDATATYPE);
     addDataTypeNode(server, "Guid", UA_NS0ID_GUID, false, UA_NS0ID_BASEDATATYPE);

+ 0 - 2
tools/pyUANamespace/NodeID_AssumeExternal.txt

@@ -15,14 +15,12 @@ i=2266
 i=2267
 i=2271
 i=2274
-i=2292
 i=2294
 i=2735
 i=2992
 i=2993
 i=2994
 i=2268
-i=274
 i=295
 i=296
 i=11715

Datei-Diff unterdrückt, da er zu groß ist
+ 5746 - 5746
tools/schema/NodeIds.csv


Datei-Diff unterdrückt, da er zu groß ist
+ 2347 - 2390
tools/schema/Opc.Ua.Types.bsd


+ 2 - 2
tools/schema/namespace0/Opc.Ua.NodeSet2.Minimal.xml

@@ -49,7 +49,7 @@
     <References>
       <Reference ReferenceType="HasSubtype" IsForward="false">i=34</Reference>
     </References>
-    <InverseName>HasSupertype</InverseName>
+    <InverseName>SubtypeOf</InverseName>
   </UAReferenceType>
   <UAReferenceType NodeId="i=33" BrowseName="HierarchicalReferences" IsAbstract="true">
     <DisplayName>HierarchicalReferences</DisplayName>
@@ -380,7 +380,7 @@
     <DisplayName>UInteger</DisplayName>
     <Description>Describes a value that can have any unsigned integer DataType.</Description>
     <References>
-      <Reference ReferenceType="HasSubtype" IsForward="false">i=27</Reference>
+      <Reference ReferenceType="HasSubtype" IsForward="false">i=26</Reference>
     </References>
   </UADataType>
   <UADataType NodeId="i=3" BrowseName="Byte">

Datei-Diff unterdrückt, da er zu groß ist
+ 31499 - 17057
tools/schema/namespace0/Opc.Ua.NodeSet2.xml