From 1fe167069a7db347a0262cd3bdb4ee381f293153 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 15 Nov 2018 17:00:13 +0100
Subject: [PATCH] FIX Lubro --> aux groups

---
 Jenkinsfile                                     |  2 +-
 MTC_Adapter/SCMA/DATA/CONF/DataModel.xml        | 10 ++++++++++
 MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map | 11 +++--------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 84e36a4..11bd7a5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,7 +15,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=352']) {
+        withEnv(['NEXT_BUILD_NUMBER=354']) {
           // 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 95e3a77..bc0cc24 100644
--- a/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
+++ b/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
@@ -179,6 +179,16 @@
         <Variable SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
       </Component>
     </Component>
+    <Component Name="AuxiliaryGroups">
+      <Component Name="01">
+        <Property SymbolicName="Type"  BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="LUBRO" />
+        <Variable SymbolicName="Status" BrowseName="Status" DataType="ua:String" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
+        <Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />
+        <Variable SymbolicName="Repetitions" BrowseName="Repetitions" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="Distance" BrowseName="Distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="ActiveTime" BrowseName="ActiveTime" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+      </Component>
+    </Component>
 
     <Component Name="VacuumPump1">
       <Variable SymbolicName="workTime" BrowseName="workTime" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
diff --git a/MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map b/MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map
index 611d9b6..1621be6 100644
--- a/MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map
+++ b/MTC_Adapter/SCMA/DATA/CONF/NameRepRolesList.map
@@ -150,15 +150,10 @@ A|I|ST_UnOp_02_Status|OperatingGroups:02:Status
 A|I|ST_UnOp_03_Status|OperatingGroups:03:Status
 A|I|ST_UnOp_04_Status|OperatingGroups:04:Status
 
-A|I|UnOp_01_NumCU|OperatingGroups:01:ToolChanges
-A|I|UnOp_02_NumCU|OperatingGroups:02:ToolChanges
-A|I|UnOp_03_NumCU|OperatingGroups:03:ToolChanges
-A|I|UnOp_04_NumCU|OperatingGroups:04:ToolChanges
+# riorganizzaizone gruppi ausiliari (occhio agli indici!!!)
+A|I|Lubro_01_Count|AuxiliaryGroups:01:Repetitions
+A|I|Lubro_01_Status|AuxiliaryGroups:01:Status
 
-A|I|UnOp_01_NumCU|OperatingGroups:01:ToolChanges
-A|I|UnOp_02_NumCU|OperatingGroups:02:ToolChanges
-A|I|UnOp_03_NumCU|OperatingGroups:03:ToolChanges
-A|I|UnOp_04_NumCU|OperatingGroups:04:ToolChanges
 
 #------------------------------------------------------------
 # B: Ricerca dall'INIZIO stringa (BEGIN, regexp: ^VAR)