From a119fdc1cb3f8954fa5ffe9fa88ac71e7caabade Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 31 Aug 2016 11:45:18 +0200
Subject: [PATCH] vers 1.1.31: aggiunta lettura UnOp status da variabili stato
 PLC fix messaggio generico a vuoto

---
 AgentBin/CMS.xml                      | 12 ++++++------
 MTC_Sim/MTC_Sim/AdapterFanuc.cs       | 16 ++++++++++++++++
 MTC_Sim/MTC_Sim/AdapterGeneric.cs     |  2 +-
 MTC_Sim/MTC_Sim/CmsStatusDataConf.txt |  3 ++-
 MTC_Sim/VersGen/AdapterVers.cs        |  4 ++--
 MTC_Sim/VersGen/AdapterVers.tt        |  4 ++--
 6 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/AgentBin/CMS.xml b/AgentBin/CMS.xml
index 94a594e..4183cf1 100644
--- a/AgentBin/CMS.xml
+++ b/AgentBin/CMS.xml
@@ -10,9 +10,9 @@
         <DataItem category="SAMPLE" id="ACC_TIME" name="Tempo macchina ON" type="ACCUMULATED_TIME"/>
         <DataItem category="SAMPLE" id="ACC_TIME_WORK" name="Tempo macchina in RUN" type="ACCUMULATED_TIME"/>
         <DataItem category="SAMPLE" id="CLOCK" type="CLOCK_TIME"/>
-        <DataItem category="SAMPLE" id="POWER" type="MESSAGE"/>
+        <DataItem category="EVENT" id="POWER" type="MESSAGE"/>
         <DataItem category="EVENT" id="OperatorId" type="MESSAGE"/>
-        <DataItem category="EVENT" id="FUNCT_MODE" type="MESSAGE"/>
+        <!--<DataItem category="EVENT" id="FUNCT_MODE" type="MESSAGE"/>-->
         <DataItem category="EVENT" id="USER_ACTION" type="MESSAGE"/>
         <DataItem category="EVENT" id="TESTING_DATA" type="MESSAGE"/>
         <DataItem category="EVENT" id="PROTECTION_STATUS" type="MESSAGE"/>
@@ -40,7 +40,7 @@
                 <!--<DataItem category="SAMPLE" id="Axis_01_AccelAct" name="Accelerazione asse X (1)" nativeUnits="MILLIMETER/SECOND^2" type="ACCELERATION" units="MILLIMETER/SECOND^2"/>-->
                 <DataItem category="SAMPLE" id="Axis_01_AccTime" name="Tempo impiego cumulato asse X (1)" nativeUnits="SECOND" type="ACCUMULATED_TIME" units="SECOND"/>
                 <!--<DataItem category="SAMPLE" id="Axis_01_Battery" name="Valore batteria asse X (1)" nativeUnits="VOLT" type="VOLTAGE" units="VOLT"/>-->
-                <DataItem category="SAMPLE" id="Axis_01_DistDone" name="Distanza TOTALE percorsa dall'asse X (1)" nativeUnits="METER" type="LENGHT" units="METER"/>
+                <DataItem category="SAMPLE" id="Axis_01_DistDone" name="Distanza TOTALE percorsa dall'asse X (1)" nativeUnits="MILLIMETER" type="LENGHT" units="METER"/>
                 <DataItem category="SAMPLE" id="Axis_01_InvDDone" name="Num cambi direzione asse X (1)" nativeUnits="COUNT" type="MESSAGE" units="COUNT"/>
                 <!--<DataItem type="TEMPERATURE" id="Temp_01_Value" category="SAMPLE" name="Sonda Temperatura asse 1" units="DEGREE" />-->
                 <DataItem category="CONDITION" id="Axis_01_AlarmCNC" type="SYSTEM"/>
@@ -63,7 +63,7 @@
                 <!--<DataItem category="SAMPLE" id="Axis_02_AccelAct" name="Accelerazione asse Y (2)" nativeUnits="MILLIMETER/SECOND^2" type="ACCELERATION" units="MILLIMETER/SECOND^2"/>-->
                 <DataItem category="SAMPLE" id="Axis_02_AccTime" name="Tempo impiego cumulato asse Y (2)" nativeUnits="SECOND" type="ACCUMULATED_TIME" units="SECOND"/>
                 <!--<DataItem category="SAMPLE" id="Axis_02_Battery" name="Valore batteria asse Y (2)" nativeUnits="VOLT" type="VOLTAGE" units="VOLT"/>-->
-                <DataItem category="SAMPLE" id="Axis_02_DistDone" name="Distanza TOTALE percorsa dall'asse Y (2)" nativeUnits="METER" type="LENGHT" units="METER"/>
+                <DataItem category="SAMPLE" id="Axis_02_DistDone" name="Distanza TOTALE percorsa dall'asse Y (2)" nativeUnits="MILLIMETER" type="LENGHT" units="METER"/>
                 <DataItem category="SAMPLE" id="Axis_02_InvDDone" name="Num cambi direzione asse Y (2)" nativeUnits="COUNT" type="MESSAGE" units="COUNT"/>
                 <!--<DataItem type="TEMPERATURE" id="Temp_02_Value" category="SAMPLE" name="Sonda Temperatura asse 2" units="DEGREE" />-->
                 <DataItem category="CONDITION" id="Axis_02_AlarmCNC" type="SYSTEM"/>
@@ -86,7 +86,7 @@
                 <!--<DataItem category="SAMPLE" id="Axis_03_AccelAct" name="Accelerazione asse Z (3)" nativeUnits="MILLIMETER/SECOND^2" type="ACCELERATION" units="MILLIMETER/SECOND^2"/>-->
                 <DataItem category="SAMPLE" id="Axis_03_AccTime" name="Tempo impiego cumulato asse Z (3)" nativeUnits="SECOND" type="ACCUMULATED_TIME" units="SECOND"/>
                 <!--<DataItem category="SAMPLE" id="Axis_03_Battery" name="Valore batteria asse Z (3)" nativeUnits="VOLT" type="VOLTAGE" units="VOLT"/>-->
-                <DataItem category="SAMPLE" id="Axis_03_DistDone" name="Distanza TOTALE percorsa dall'asse Z (3)" nativeUnits="METER" type="LENGHT" units="METER"/>
+                <DataItem category="SAMPLE" id="Axis_03_DistDone" name="Distanza TOTALE percorsa dall'asse Z (3)" nativeUnits="MILLIMETER" type="LENGHT" units="METER"/>
                 <DataItem category="SAMPLE" id="Axis_03_InvDDone" name="Num cambi direzione asse X (3)" nativeUnits="COUNT" type="MESSAGE" units="COUNT"/>
                 <!--<DataItem type="TEMPERATURE" id="Temp_03_Value" category="SAMPLE" name="Sonda Temperatura asse 3" units="DEGREE" />-->
                 <DataItem category="CONDITION" id="Axis_03_AlarmCNC" type="SYSTEM"/>
@@ -109,7 +109,7 @@
                 <!--<DataItem category="SAMPLE" id="Axis_06_AccelAct" name="Accelerazione asse U (6)" nativeUnits="MILLIMETER/SECOND^2" type="ACCELERATION" units="MILLIMETER/SECOND^2"/>-->
                 <DataItem category="SAMPLE" id="Axis_06_AccTime" name="Tempo impiego cumulato asse U (6)" nativeUnits="SECOND" type="ACCUMULATED_TIME" units="SECOND"/>
                 <!--<DataItem category="SAMPLE" id="Axis_06_Battery" name="Valore batteria asse U (6)" nativeUnits="VOLT" type="VOLTAGE" units="VOLT"/>-->
-                <DataItem category="SAMPLE" id="Axis_06_DistDone" name="Distanza TOTALE percorsa dall'asse U (6)" nativeUnits="METER" type="LENGHT" units="METER"/>
+                <DataItem category="SAMPLE" id="Axis_06_DistDone" name="Distanza TOTALE percorsa dall'asse U (6)" nativeUnits="MILLIMETER" type="LENGHT" units="METER"/>
                 <DataItem category="SAMPLE" id="Axis_06_InvDDone" name="Num cambi direzione asse U (6)" nativeUnits="COUNT" type="MESSAGE" units="COUNT"/>
                 <!--<DataItem type="TEMPERATURE" id="Temp_06_Value" category="SAMPLE" name="Sonda Temperatura asse 6" units="DEGREE" />-->
                 <DataItem category="CONDITION" id="Axis_06_AlarmCNC" type="SYSTEM"/>
diff --git a/MTC_Sim/MTC_Sim/AdapterFanuc.cs b/MTC_Sim/MTC_Sim/AdapterFanuc.cs
index b3c3315..4e9ef32 100644
--- a/MTC_Sim/MTC_Sim/AdapterFanuc.cs
+++ b/MTC_Sim/MTC_Sim/AdapterFanuc.cs
@@ -999,6 +999,22 @@ namespace MTC_Adapter
                         }
                     }
                 }
+                else if (statusData[i].varName.StartsWith("UnOp_"))
+                {
+                    if (statusData[i].varName.EndsWith("_Status"))
+                    {
+                        try
+                        {
+                            numero = Convert.ToInt32(statusData[i].varName.Replace("UnOp_", "").Replace("_Status", ""));
+                        }
+                        catch
+                        { }
+                        if (numero > 0)
+                        {
+                            vettUnOp[numero - 1].mUnOpStatus.Value = status;
+                        }
+                    }
+                }
             }
         }
         /// <summary>
diff --git a/MTC_Sim/MTC_Sim/AdapterGeneric.cs b/MTC_Sim/MTC_Sim/AdapterGeneric.cs
index 56a247c..f0568eb 100644
--- a/MTC_Sim/MTC_Sim/AdapterGeneric.cs
+++ b/MTC_Sim/MTC_Sim/AdapterGeneric.cs
@@ -940,7 +940,7 @@ namespace MTC_Adapter
             // item disponibilità
             mAdapter.AddDataItem(mAvail);
             mAvail.Value = "AVAILABLE";
-
+            mMessage.Value = "";
 
             // status, clock, emergency stop
             mAdapter.AddDataItem(mStatus);
diff --git a/MTC_Sim/MTC_Sim/CmsStatusDataConf.txt b/MTC_Sim/MTC_Sim/CmsStatusDataConf.txt
index d6fc35e..223c046 100644
--- a/MTC_Sim/MTC_Sim/CmsStatusDataConf.txt
+++ b/MTC_Sim/MTC_Sim/CmsStatusDataConf.txt
@@ -3,4 +3,5 @@
 002|VacPump_01_Status			|BIT
 003|VacPump_02_Status			|BIT
 004|Cooler_01_Status			|BIT
-005|Cooler_02_Status			|BIT
\ No newline at end of file
+005|Cooler_02_Status			|BIT
+006|UnOp_01_Status				|BIT
\ No newline at end of file
diff --git a/MTC_Sim/VersGen/AdapterVers.cs b/MTC_Sim/VersGen/AdapterVers.cs
index 9782db4..37c1294 100644
--- a/MTC_Sim/VersGen/AdapterVers.cs
+++ b/MTC_Sim/VersGen/AdapterVers.cs
@@ -5,7 +5,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.1.30.99")]
-[assembly: AssemblyFileVersion("1.1.30.99")]
+[assembly: AssemblyVersion("1.1.31.100")]
+[assembly: AssemblyFileVersion("1.1.31.100")]
 [assembly: AssemblyCopyright("Steamware-SCM-CMS © 2015-2016")]
 [assembly: AssemblyCompany("Steamware-SCM-CMS")]
diff --git a/MTC_Sim/VersGen/AdapterVers.tt b/MTC_Sim/VersGen/AdapterVers.tt
index ba9eccf..62f15ee 100644
--- a/MTC_Sim/VersGen/AdapterVers.tt
+++ b/MTC_Sim/VersGen/AdapterVers.tt
@@ -6,8 +6,8 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.1.30.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("1.1.30.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("1.1.31.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("1.1.31.<#= this.RevisionNumber #>")]
 [assembly: AssemblyCopyright("Steamware-SCM-CMS © 2015-<#= DateTime.Now.Year #>")]
 [assembly: AssemblyCompany("Steamware-SCM-CMS")]
 <#+