From dfd69c86c96a8c9a852a562402b783fba9d71693 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 28 Jun 2017 18:20:15 +0200
Subject: [PATCH] =?UTF-8?q?eliminato=20EVENT=20globale=20procetion=20statu?=
 =?UTF-8?q?s=20(=C3=A8=20IMPLICITO=20nella=20gestione=20vettore=20memorie?=
 =?UTF-8?q?=20stati)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MTC_Adapter/MTC_Adapter/AdapterGeneric.cs | 104 +++++++++++-----------
 1 file changed, 54 insertions(+), 50 deletions(-)

diff --git a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
index 5cc7678..d4d0301 100644
--- a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
+++ b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
@@ -806,7 +806,7 @@ namespace MTC_Adapter
     /// Contenuto valori status data da PLC
     /// </summary>
     public otherData[] statusData;
-    
+
     /// <summary>
     /// data-ora ultimo controllo movimento assi
     /// </summary>
@@ -1033,10 +1033,6 @@ namespace MTC_Adapter
     /// </summary>
     public Event mOperator = new Event("OperatorId");
     /// <summary>
-    /// Stato protezioni (0/1, off/on)
-    /// </summary>
-    public Event mProtectionStatus = new Event("PROTECTION_STATUS");
-    /// <summary>
     /// Vettore EVENTS letti da area status
     /// </summary>
     public Event[] mStatusEvents;
@@ -1156,10 +1152,7 @@ namespace MTC_Adapter
 
       // testing e autodiagnostica
       mAdapter.AddDataItem(mTestingData);
-
-      // stato protezioni
-      mAdapter.AddDataItem(mProtectionStatus);
-
+      
       // strobe/status non riconosciuti
       mAdapter.AddDataItem(mUnkStatus);
       mAdapter.AddDataItem(mUnkStrobe);
@@ -1488,11 +1481,13 @@ namespace MTC_Adapter
       Array.Resize<otherData>(ref statusData, numRiga);
 
       if (utils.CRB("verbose")) lg.Info(string.Format("Fine caricamento vettore di {0} variabili status gestite", numRiga));
+
       // ora inizializzo l''insieme degli eventi di status
       mStatusEvents = new Event[numRiga];
       for (int i = 0; i < numRiga; i++)
       {
         mStatusEvents[i] = new Event(statusData[i].varName);
+        mAdapter.AddDataItem(mStatusEvents[i]);
       }
       if (utils.CRB("verbose")) lg.Info(string.Format("inizializzato vettore di {0} MTC.EVENTS di status", numRiga));
     }
@@ -3570,6 +3565,7 @@ namespace MTC_Adapter
       int bitNum = 0;
       int byteNum = 0;
       byte byteVal;
+      StringBuilder sb = new StringBuilder();
       // uno ad uno vado a inserirli nella mappa dei dati dell'adapter...
       int numero = 0;
       string status = "";
@@ -3593,60 +3589,68 @@ namespace MTC_Adapter
           status = "INACTIVE";
         }
 
-        if (statusData[i].varName == "PROTECTION_STATUS")
+        // vecchia versione
+        if (false)
         {
-          mProtectionStatus.Value = status;
-        }
-        else if (statusData[i].varName.StartsWith("VacPump_"))
-        {
-          if (statusData[i].varName.EndsWith("_Status"))
+          if (statusData[i].varName.StartsWith("VacPump_"))
           {
-            try
+            if (statusData[i].varName.EndsWith("_Status"))
             {
-              numero = Convert.ToInt32(statusData[i].varName.Replace("VacPump_", "").Replace("_Status", ""));
+              try
+              {
+                numero = Convert.ToInt32(statusData[i].varName.Replace("VacPump_", "").Replace("_Status", ""));
+              }
+              catch
+              {
+              }
+              if (numero > 0)
+              {
+                vettVacPump[numero - 1].mVacPumpStatus.Value = status;
+              }
             }
-            catch
+          }
+          else if (statusData[i].varName.StartsWith("Cooler_"))
+          {
+            if (statusData[i].varName.EndsWith("_Status"))
             {
+              try
+              {
+                numero = Convert.ToInt32(statusData[i].varName.Replace("Cooler_", "").Replace("_Status", ""));
+              }
+              catch
+              { }
+              if (numero > 0)
+              {
+                vettCooler[numero - 1].mCoolStatus.Value = status;
+              }
             }
-            if (numero > 0)
+          }
+          else if (statusData[i].varName.StartsWith("UnOp_"))
+          {
+            if (statusData[i].varName.EndsWith("_Status"))
             {
-              vettVacPump[numero - 1].mVacPumpStatus.Value = status;
+              try
+              {
+                numero = Convert.ToInt32(statusData[i].varName.Replace("UnOp_", "").Replace("_Status", ""));
+              }
+              catch
+              { }
+              if (numero > 0)
+              {
+                vettUnOp[numero - 1].mUnOpStatus.Value = status;
+              }
             }
           }
         }
-        else if (statusData[i].varName.StartsWith("Cooler_"))
+        else
         {
-          if (statusData[i].varName.EndsWith("_Status"))
-          {
-            try
-            {
-              numero = Convert.ToInt32(statusData[i].varName.Replace("Cooler_", "").Replace("_Status", ""));
-            }
-            catch
-            { }
-            if (numero > 0)
-            {
-              vettCooler[numero - 1].mCoolStatus.Value = status;
-            }
-          }
-        }
-        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;
-            }
-          }
+          mStatusEvents[i].Value = status;
+          // accodo ultimi codici in visualizzazione...
+          sb.AppendLine(string.Format("STS | {0}", mStatusEvents[i]).Replace("|", " | "));
         }
       }
+      // aggiungo i vari status rilevati
+      parentForm.dataMonitor_2 += sb.ToString();
     }
     /// <summary>
     /// procedura di lettura (multistep) dati da memoria x caricare dati utensile