From 4bd034aa957e0951563be4918106511cd8b08a47 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 15 Nov 2018 12:20:31 +0100
Subject: [PATCH] Fix datamodel aree plc e hmi

---
 MTC_Adapter/SCMA/DATA/CONF/DataModel.xml        | 16 +++++++++++++++-
 MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml b/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
index 8c7f026..3e5c7ad 100644
--- a/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
+++ b/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
@@ -12,7 +12,7 @@
     <Variable SymbolicName="mode" BrowseName="mode" DataType="ua:String" ValueRank="Scalar" GenerationRate="" Range="[Auto MDI Manual Calibration]" Units="Enumeration" />
     <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="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" Severity="high" GenerationRate="10000" Range="[]" Units="" />
       <Component Name="CncProcesses">
         <Component Name="01">
@@ -34,6 +34,20 @@
         </Component>
       </Component>
     </Component>
+    <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" Severity="high" GenerationRate="10000" Range="[]" 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" Severity="high" GenerationRate="10000" Range="[]" Units="" />
+      <Variable SymbolicName="User" BrowseName="User" DataType="ua:String" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
+      <Variable SymbolicName="Language" BrowseName="Language" DataType="ua:String" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
+      <Variable SymbolicName="ActiveSection" BrowseName="ActiveSection" DataType="ua:String" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
+      <Variable SymbolicName="ActiveTimeSession" BrowseName="ActiveTimeSession" DataType="ua:String" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
+    </Component>
     <Component Name="Axes">
       <Variable SymbolicName="FeedRate" BrowseName="FeedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
       <Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
diff --git a/MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map b/MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map
index 0b57b4c..8193e71 100644
--- a/MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map
+++ b/MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map
@@ -24,7 +24,7 @@ A|I|PROC_SEL|ProcSel
 A|I|CodG_ACT|CodGAct
 A|I|USER_ACTION|UserAction
 
-# variabili 1:1 per mapping "forzato" CMS 9084
+# variabili 1:1 per mapping "forzato" CMS 9110
 A|I|Axis_01_FeedAct|Axes:AxisX:FeedRate
 A|I|Axis_02_FeedAct|Axes:AxisY:FeedRate
 A|I|Axis_03_FeedAct|Axes:AxisZ:FeedRate