Add DataTypeDefinition for complex types (V1.04) (Azure-Samples#30)

* Create the modelcompiler output to support DataTypeDefinitions * reduce number of UA assemblies used Co-authored-by: Hans Gschossmann <[email protected]>
eoursel · Nov 19, 2020 · a2a0e16 · a2a0e16
1 parent cc19ed4
commit a2a0e16
Show file tree

Hide file tree

Showing 5 changed files with 120 additions and 9 deletions.
diff --git a/src/Boiler/BoilerModel.NodeSet2.xml b/src/Boiler/BoilerModel.NodeSet2.xml
@@ -5,7 +5,7 @@
   </NamespaceUris>
   <Models>
     <Model ModelUri="http://microsoft.com/Opc/OpcPlc/Boiler">
-      <RequiredModel ModelUri="http://opcfoundation.org/UA/" Version="1.04" PublicationDate="2019-05-01T00:00:00Z" />
+      <RequiredModel ModelUri="http://opcfoundation.org/UA/" Version="1.04.6" PublicationDate="2020-04-10T00:00:00Z" />
     </Model>
   </Models>
   <Aliases>

diff --git a/src/Boiler/BoilerModel.PredefinedNodes.uanodes b/src/Boiler/BoilerModel.PredefinedNodes.uanodes
diff --git a/src/Boiler/BoilerModel.PredefinedNodes.xml b/src/Boiler/BoilerModel.PredefinedNodes.xml
@@ -19,6 +19,51 @@
     <uax:SuperTypeId>
       <uax:Identifier>i=22</uax:Identifier>
     </uax:SuperTypeId>
+    <uax:DataTypeDefinition>
+      <uax:TypeId>
+        <uax:Identifier>i=14798</uax:Identifier>
+      </uax:TypeId>
+      <uax:Body>
+        <uax:StructureDefinition>
+          <uax:BaseDataType>
+            <uax:Identifier>i=22</uax:Identifier>
+          </uax:BaseDataType>
+          <uax:StructureType>Structure_0</uax:StructureType>
+          <uax:Fields>
+            <uax:StructureField>
+              <uax:Name>Temperature</uax:Name>
+              <uax:DataType>
+                <uax:Identifier>ns=1;i=15001</uax:Identifier>
+              </uax:DataType>
+              <uax:ValueRank>-1</uax:ValueRank>
+              <uax:ArrayDimensions />
+              <uax:MaxStringLength>0</uax:MaxStringLength>
+              <uax:IsOptional>false</uax:IsOptional>
+            </uax:StructureField>
+            <uax:StructureField>
+              <uax:Name>Pressure</uax:Name>
+              <uax:DataType>
+                <uax:Identifier>i=6</uax:Identifier>
+              </uax:DataType>
+              <uax:ValueRank>-1</uax:ValueRank>
+              <uax:ArrayDimensions />
+              <uax:MaxStringLength>0</uax:MaxStringLength>
+              <uax:IsOptional>false</uax:IsOptional>
+            </uax:StructureField>
+            <uax:StructureField>
+              <uax:Name>HeaterState</uax:Name>
+              <uax:DataType>
+                <uax:Identifier>ns=1;i=15014</uax:Identifier>
+              </uax:DataType>
+              <uax:ValueRank>-1</uax:ValueRank>
+              <uax:ArrayDimensions />
+              <uax:MaxStringLength>0</uax:MaxStringLength>
+              <uax:IsOptional>false</uax:IsOptional>
+            </uax:StructureField>
+          </uax:Fields>
+        </uax:StructureDefinition>
+      </uax:Body>
+    </uax:DataTypeDefinition>
   </BoilerDataType>
   <BoilerTemperatureType xmlns="http://microsoft.com/Opc/OpcPlc/Boiler">
     <uax:NodeClass>DataType_64</uax:NodeClass>
@@ -36,6 +81,41 @@
     <uax:SuperTypeId>
       <uax:Identifier>i=22</uax:Identifier>
     </uax:SuperTypeId>
+    <uax:DataTypeDefinition>
+      <uax:TypeId>
+        <uax:Identifier>i=14798</uax:Identifier>
+      </uax:TypeId>
+      <uax:Body>
+        <uax:StructureDefinition>
+          <uax:BaseDataType>
+            <uax:Identifier>i=22</uax:Identifier>
+          </uax:BaseDataType>
+          <uax:StructureType>Structure_0</uax:StructureType>
+          <uax:Fields>
+            <uax:StructureField>
+              <uax:Name>Top</uax:Name>
+              <uax:DataType>
+                <uax:Identifier>i=6</uax:Identifier>
+              </uax:DataType>
+              <uax:ValueRank>-1</uax:ValueRank>
+              <uax:ArrayDimensions />
+              <uax:MaxStringLength>0</uax:MaxStringLength>
+              <uax:IsOptional>false</uax:IsOptional>
+            </uax:StructureField>
+            <uax:StructureField>
+              <uax:Name>Bottom</uax:Name>
+              <uax:DataType>
+                <uax:Identifier>i=6</uax:Identifier>
+              </uax:DataType>
+              <uax:ValueRank>-1</uax:ValueRank>
+              <uax:ArrayDimensions />
+              <uax:MaxStringLength>0</uax:MaxStringLength>
+              <uax:IsOptional>false</uax:IsOptional>
+            </uax:StructureField>
+          </uax:Fields>
+        </uax:StructureDefinition>
+      </uax:Body>
+    </uax:DataTypeDefinition>
   </BoilerTemperatureType>
   <BoilerHeaterStateType xmlns="http://microsoft.com/Opc/OpcPlc/Boiler">
     <uax:NodeClass>DataType_64</uax:NodeClass>
@@ -53,6 +133,31 @@
     <uax:SuperTypeId>
       <uax:Identifier>i=29</uax:Identifier>
     </uax:SuperTypeId>
+    <uax:DataTypeDefinition>
+      <uax:TypeId>
+        <uax:Identifier>i=14799</uax:Identifier>
+      </uax:TypeId>
+      <uax:Body>
+        <uax:EnumDefinition>
+          <uax:Fields>
+            <uax:EnumField>
+              <uax:Value>0</uax:Value>
+              <uax:DisplayName>
+                <uax:Text>Off</uax:Text>
+              </uax:DisplayName>
+              <uax:Name>Off</uax:Name>
+            </uax:EnumField>
+            <uax:EnumField>
+              <uax:Value>1</uax:Value>
+              <uax:DisplayName>
+                <uax:Text>On</uax:Text>
+              </uax:DisplayName>
+              <uax:Name>On</uax:Name>
+            </uax:EnumField>
+          </uax:Fields>
+        </uax:EnumDefinition>
+      </uax:Body>
+    </uax:DataTypeDefinition>
     <EnumStrings xmlns="http://opcfoundation.org/UA/">
       <uax:NodeClass>Variable_2</uax:NodeClass>
       <uax:NodeId>

diff --git a/src/Boiler/BuildDesign.bat b/src/Boiler/BuildDesign.bat
@@ -1,7 +1,12 @@
-@echo off
-
-echo Building ModelDesign
-
-docker run --mount type=bind,source=%CD%,target=/model sailavid/ua-modelcompiler -- -console -d2 /model/ModelDesign.xml -cg /model/ModelDesign.csv -o2 /model -version v104
-
-echo Success!
+@echo off
+
+echo Building ModelDesign
+
+REM Issue> The ModelCompiler from docker doesn't create the DataTypeDefinition'
+REM docker run --mount type=bind,source=%CD%,target=/model sailavid/ua-modelcompiler -- -console -version v104 -d2 /model/ModelDesign.xml -cg /model/ModelDesign.csv -o2 /model
+
+REM Build master branch in https://github.com/OPCFoundation/UA-ModelCompiler
+REM add ModelCompiler build output folder to PATH
+Opc.Ua.ModelCompiler.exe -version v104 -d2 ".\ModelDesign.xml" -c ".\ModelDesign.csv" -o2 ".\"
+
+echo Success!
diff --git a/src/opc-plc.csproj b/src/opc-plc.csproj
@@ -23,7 +23,8 @@
   <ItemGroup>
     <PackageReference Include="Mono.Options" Version="6.6.0.161" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Symbols" Version="1.4.363.107" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core.Debug" Version="1.4.363.107" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server.Debug" Version="1.4.363.107" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />