From 177b3e657db05de2272dee329eac1dafc7d2d4d4 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Sat, 17 Nov 2018 10:18:19 +0100
Subject: [PATCH] Update DataModel (attributo type --> Type)

---
 Jenkinsfile                              |  2 +-
 MTC_Adapter/SCMA/DATA/CONF/DataModel.xml | 46 ++++++++++++------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ec7f4b4..1959cc0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,7 +15,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=362']) {
+        withEnv(['NEXT_BUILD_NUMBER=363']) {
           // env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '2.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'SCMA'
diff --git a/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml b/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
index a5f2d03..1f41574 100644
--- a/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
+++ b/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
@@ -5,18 +5,18 @@
     <Property SymbolicName="Serial" BrowseName="Serial" DataType="ua:String" ValueRank="Scalar" Value="9110" />
     <Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="CNC MACHINE" />
     <Property SymbolicName="BuildYear" BrowseName="BuildYear" DataType="ua:String" ValueRank="Scalar" Value="2018" />
-	<!-- <Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" /> -->
+  <!-- <Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" /> -->
     <Variable SymbolicName="Alarm" BrowseName="Alarm" DataType="ua:Boolean" ValueRank="Scalar" Units="Bool" />
     <Variable SymbolicName="Emergency" BrowseName="Emergency" DataType="ua:Boolean" ValueRank="Scalar" Units="Bool" />
-    <!-- <Condition SymbolicName="CNC" BrowseName="CNC" DataType="ua:String" ValueRank="Scalar" type="OffNormalAlarmState" Severity="high" Units="" /> -->
-    <!-- <Condition SymbolicName="PLC" BrowseName="PLC" DataType="ua:String" ValueRank="Scalar" type="OffNormalAlarmState" Severity="high" Units="" /> -->
-	<Variable SymbolicName="Power" BrowseName="Power" DataType="ua:Boolean" ValueRank="Scalar" Units="Bool" />
-	<Variable SymbolicName="Mode" BrowseName="Mode" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
+    <!-- <Condition SymbolicName="CNC" BrowseName="CNC" DataType="ua:String" ValueRank="Scalar" Type="OffNormalAlarmState" Severity="high" Units="" /> -->
+    <!-- <Condition SymbolicName="PLC" BrowseName="PLC" DataType="ua:String" ValueRank="Scalar" Type="OffNormalAlarmState" Severity="high" Units="" /> -->
+  <Variable SymbolicName="Power" BrowseName="Power" DataType="ua:Boolean" ValueRank="Scalar" Units="Bool" />
+  <Variable SymbolicName="Mode" BrowseName="Mode" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
     <Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" />
     <Component Name="Cnc">
       <Property SymbolicName="Name" BrowseName="Name" DataType="ua:String" ValueRank="Scalar" Value="OSAI" />
       <Property SymbolicName="Version" BrowseName="Version" DataType="ua:String" ValueRank="Scalar" Value="2018" />
-      <Condition SymbolicName="Condition" BrowseName="Condition" DataType="ua:String" ValueRank="Scalar" type="OffNormalAlarmState" Units="" />
+      <Condition SymbolicName="Condition" BrowseName="Condition" DataType="ua:String" ValueRank="Scalar" Type="OffNormalAlarmState" Units="" />
       <Component Name="CncProcesses">
         <Component Name="01">
           <Variable SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
@@ -40,12 +40,12 @@
     <Component Name="Plc">
       <Property SymbolicName="Name" BrowseName="Name" DataType="ua:String" ValueRank="Scalar" Value="OSAI" />
       <Property SymbolicName="Version" BrowseName="Version" DataType="ua:String" ValueRank="Scalar" Value="2018" />
-	  <Condition SymbolicName="Condition" BrowseName="Condition" DataType="ua:String" ValueRank="Scalar" Type="OffNormalAlarmState" Units="" />
+    <Condition SymbolicName="Condition" BrowseName="Condition" DataType="ua:String" ValueRank="Scalar" Type="OffNormalAlarmState" Units="" />
     </Component>
     <Component Name="Hmi">
       <Property SymbolicName="Name" BrowseName="Name" DataType="ua:String" ValueRank="Scalar" Value="CMS Active" />
       <Property SymbolicName="Version" BrowseName="Version" DataType="ua:String" ValueRank="Scalar" Value="1.00.02" />
-	  <Condition SymbolicName="Condition" BrowseName="Condition" DataType="ua:String" ValueRank="Scalar" Type="OffNormalAlarmState" Units="" />
+    <Condition SymbolicName="Condition" BrowseName="Condition" DataType="ua:String" ValueRank="Scalar" Type="OffNormalAlarmState" Units="" />
       <Variable SymbolicName="User" BrowseName="User" DataType="ua:String" ValueRank="Scalar" Units="" />
       <Variable SymbolicName="Language" BrowseName="Language" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
       <Variable SymbolicName="ActiveSection" BrowseName="ActiveSection" DataType="ua:String" ValueRank="Scalar" Units="h" />
@@ -134,7 +134,7 @@
     <Component Name="OperatingGroups">
       <Component Name="01">
         <Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="SPINDLE" />
-		<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="CMS-SPINDLE-01" />
+    <Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="CMS-SPINDLE-01" />
         <Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
         <Variable SymbolicName="Distance" BrowseName="Distance" DataType="ua:Float" ValueRank="Scalar" Units="Krev" />
         <Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" />
@@ -147,7 +147,7 @@
       </Component>
       <Component Name="02">
         <Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="SPINDLE" />
-		<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="CMS-SPINDLE-01" />
+    <Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="CMS-SPINDLE-01" />
         <Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
         <Variable SymbolicName="Distance" BrowseName="Distance" DataType="ua:Float" ValueRank="Scalar" Units="Krev" />
         <Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" />
@@ -160,7 +160,7 @@
       </Component>
       <Component Name="03">
         <Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="SPINDLE" />
-		<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="CMS-SPINDLE-01" />
+    <Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="CMS-SPINDLE-01" />
         <Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
         <Variable SymbolicName="Distance" BrowseName="Distance" DataType="ua:Float" ValueRank="Scalar" Units="Krev" />
         <Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" />
@@ -173,7 +173,7 @@
       </Component>
       <Component Name="04">
         <Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="SPINDLE" />
-		<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="CMS-SPINDLE-01" />
+    <Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="CMS-SPINDLE-01" />
         <Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
         <Variable SymbolicName="Distance" BrowseName="Distance" DataType="ua:Float" ValueRank="Scalar" Units="Krev" />
         <Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" Units="h" />
@@ -188,7 +188,7 @@
     <Component Name="AuxiliaryGroups">
       <Component Name="01">
         <Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="COOLER" />
-		<!--<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" /> -->
+    <!--<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" /> -->
         <Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
         <!--<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Perc" />-->
         <Variable SymbolicName="Repetitions" BrowseName="Repetitions" DataType="ua:Float" ValueRank="Scalar" Units="Count" />
@@ -196,7 +196,7 @@
       </Component>
       <Component Name="02">
         <Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="COOLER" />
-		<!--<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" /> -->
+    <!--<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" /> -->
         <Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
         <!--<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Perc" />-->
         <Variable SymbolicName="Repetitions" BrowseName="Repetitions" DataType="ua:Float" ValueRank="Scalar" Units="Count" />
@@ -204,7 +204,7 @@
       </Component>
       <Component Name="03">
         <Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="COOLER" />
-		<!-- <Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" /> -->
+    <!-- <Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" /> -->
         <Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
         <!--<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Perc" />-->
         <Variable SymbolicName="Repetitions" BrowseName="Repetitions" DataType="ua:Float" ValueRank="Scalar" Units="Count" />
@@ -212,7 +212,7 @@
       </Component>
       <Component Name="04">
         <Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="VACUUM_PUMP" />
-		<!--<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" /> -->
+    <!--<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" /> -->
         <Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
         <!--<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Perc" />
         <Variable SymbolicName="Repetitions" BrowseName="Repetitions" DataType="ua:Float" ValueRank="Scalar" Units="Count" />-->
@@ -220,7 +220,7 @@
       </Component>
       <Component Name="05">
         <Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="VACUUM_PUMP" />
-		<!-- <Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" /> -->
+    <!-- <Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" /> -->
         <Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" />
         <!--<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Perc" />
         <Variable SymbolicName="Repetitions" BrowseName="Repetitions" DataType="ua:Float" ValueRank="Scalar" Units="Count" />-->
@@ -228,7 +228,7 @@
       </Component>
       <Component Name="06">
         <Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="VACUUM_ACT" />
-		<!--<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" />-->
+    <!--<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" />-->
         <!--<Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" />-->
         <!--<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Perc" />-->
         <Variable SymbolicName="Repetitions" BrowseName="Repetitions" DataType="ua:Float" ValueRank="Scalar" Units="Count" />
@@ -236,7 +236,7 @@
       </Component>
       <Component Name="07">
         <Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="VACUUM_ACT" />
-		<!--<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" />-->
+    <!--<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" />-->
         <!--<Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" />-->
         <!--<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Perc" />-->
         <Variable SymbolicName="Repetitions" BrowseName="Repetitions" DataType="ua:Float" ValueRank="Scalar" Units="Count" />
@@ -244,7 +244,7 @@
       </Component>
       <Component Name="08">
         <Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="VACUUM_ACT" />
-		<!--<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" />-->
+    <!--<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" />-->
         <!--<Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" />-->
         <!--<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Perc" />-->
         <Variable SymbolicName="Repetitions" BrowseName="Repetitions" DataType="ua:Float" ValueRank="Scalar" Units="Count" />
@@ -252,7 +252,7 @@
       </Component>
       <Component Name="09">
         <Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="VACUUM_ACT" />
-		<!--<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" />-->
+    <!--<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" />-->
         <!--<Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" />-->
         <!--<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Perc" />-->
         <Variable SymbolicName="Repetitions" BrowseName="Repetitions" DataType="ua:Float" ValueRank="Scalar" Units="Count" />
@@ -260,7 +260,7 @@
       </Component>
       <Component Name="10">
         <Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="SLITTA_MAG" />
-		<!--<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" />-->
+    <!--<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" />-->
         <!--<Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" />-->
         <!--<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Perc" />-->
         <Variable SymbolicName="Repetitions" BrowseName="Repetitions" DataType="ua:Float" ValueRank="Scalar" Units="Count" />
@@ -268,7 +268,7 @@
       </Component>
       <Component Name="11">
         <Property SymbolicName="Type" BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="SLITTA_TAST" />
-		<!--<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" />-->
+    <!--<Property SymbolicName="Model"  BrowseName="Model" DataType="ua:String" ValueRank="Scalar" Value="Modello_01" />-->
         <!--<Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" Units="Enum" />-->
         <!--<Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" Units="Perc" />-->
         <Variable SymbolicName="Repetitions" BrowseName="Repetitions" DataType="ua:Float" ValueRank="Scalar" Units="Count" />