From ca17aea695ff075c4e182e1f8e35a51e79406f9e Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 10 Mar 2017 09:47:35 +0100
Subject: [PATCH] fix: sistemato errore alias ancora presente x objects conf

---
 MTC_Adapter/MTC_Adapter/AdapterESA.cs         |  6 +-
 MTC_Adapter/MTC_Adapter/AdapterGeneric.cs     | 59 +------------------
 MTC_Adapter/MTC_Adapter/App.SCM-ESA.config    |  2 +
 .../MTC_Adapter/Resources/SCM/Appunti SCM.txt |  4 ++
 4 files changed, 9 insertions(+), 62 deletions(-)

diff --git a/MTC_Adapter/MTC_Adapter/AdapterESA.cs b/MTC_Adapter/MTC_Adapter/AdapterESA.cs
index 7f9e7d1..ffd72a1 100644
--- a/MTC_Adapter/MTC_Adapter/AdapterESA.cs
+++ b/MTC_Adapter/MTC_Adapter/AdapterESA.cs
@@ -11,10 +11,6 @@ namespace MTC_Adapter
 {
     public class AdapterESA : AdapterGeneric
     {
-#if false
-        // vettore valori in file interscambio
-        public Dictionary<string, string> generalStatus; 
-#endif
         /// <summary>
         /// Configurazione valori da leggere IOT_Byte
         /// </summary>
@@ -1061,7 +1057,7 @@ namespace MTC_Adapter
             getUnOp();
             getPath();
             getAxis();
-
+            lg.Info("DONE processAllMemory");
         }
 
         /// <summary>
diff --git a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
index deedfbb..6562d53 100644
--- a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
+++ b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
@@ -23,10 +23,6 @@ namespace MTC_Adapter
     /// </summary>
     public class VacuumPump : element
     {
-        /// <summary>
-        /// Alias
-        /// </summary>
-        public Event mVacPumpAlias;
         /// <summary>
         /// valore indca stato aperto/chiuso
         /// </summary>
@@ -53,10 +49,6 @@ namespace MTC_Adapter
     /// </summary>
     public class VacuumAct : element
     {
-        /// <summary>
-        /// Alias
-        /// </summary>
-        public Event mVacActAlias;
         /// <summary>
         /// valore numero attivazioni/disattivazioni valvola
         /// </summary>
@@ -78,10 +70,6 @@ namespace MTC_Adapter
     /// </summary>
     public class Lubro : element
     {
-        /// <summary>
-        /// Alias
-        /// </summary>
-        public Event mLubroAlias;
         /// <summary>
         /// numero pompate necessarie per far scattare sensore
         /// </summary>
@@ -108,10 +96,6 @@ namespace MTC_Adapter
     /// </summary>
     public class Cooler : element
     {
-        /// <summary>
-        /// Alias
-        /// </summary>
-        public Event mCoolAlias;
         /// <summary>
         /// Stato istantaneo (evento aperto/chiuso)
         /// </summary>
@@ -133,10 +117,6 @@ namespace MTC_Adapter
     /// </summary>
     public class Press : element
     {
-        /// <summary>
-        /// Alias
-        /// </summary>
-        public Event mPressAlias;
         /// <summary>
         /// valore pressione istantaneo
         /// </summary>
@@ -158,10 +138,6 @@ namespace MTC_Adapter
     /// </summary>
     public class Tempe : element
     {
-        /// <summary>
-        /// Alias
-        /// </summary>
-        public Event mTempAlias;
         /// <summary>
         /// valore temperatura istantaneo
         /// </summary>
@@ -183,11 +159,6 @@ namespace MTC_Adapter
     /// </summary>
     public class MemArea : element
     {
-        /// <summary>
-        /// Alias
-        /// </summary>
-        public MTConnect.Message mMemAreaAlias;
-
         /// <summary>
         /// Programma caricato
         /// </summary>
@@ -219,10 +190,6 @@ namespace MTC_Adapter
     /// </summary>
     public class Path : element
     {
-        /// <summary>
-        /// Alias
-        /// </summary>
-        public MTConnect.Message mPathAlias;
         /// <summary>
         /// Tipo Path (LAVOR/ASSERV)
         /// </summary>
@@ -361,11 +328,7 @@ namespace MTC_Adapter
     public class UnOp : element
     {
         /// <summary>
-        /// Alias
-        /// </summary>
-        public MTConnect.Message mUnOpAlias;
-        /// <summary>
-        /// Alias
+        /// ToolID
         /// </summary>
         public Event mUnOpToolId;
         /// <summary>
@@ -434,10 +397,6 @@ namespace MTC_Adapter
     /// </summary>
     public class Axis : element
     {
-        /// <summary>
-        /// Descrizione / Alias
-        /// </summary>
-        public MTConnect.Message mAxAlias;
         /// <summary>
         /// Processo di appartenenza
         /// </summary>
@@ -506,9 +465,8 @@ namespace MTC_Adapter
         /// Allarmi PCL del PATH
         /// </summary>
         public Condition mAxAlarmPLC;
-
         /// <summary>
-        /// Classe Asse con relativo ID UNIVOCO ed alias
+        /// Classe Asse con relativo ID UNIVOCO
         /// </summary>
         /// <param name="baseElem">element base contenente parametri (da XML)</param>
         public Axis(element baseElem)
@@ -1033,7 +991,6 @@ namespace MTC_Adapter
             for (int i = 0; i < adpConf.nVacuumAct; i++)
             {
                 vettVacAct[i] = new VacuumAct(adpConf.VacuumAct[i]);
-                //mAdapter.AddDataItem(vettVacAct[i].mVacActAlias);
                 mAdapter.AddDataItem(vettVacAct[i].mVacActCount);
             }
             // Lubrorefrigeranti
@@ -1041,7 +998,6 @@ namespace MTC_Adapter
             for (int i = 0; i < adpConf.nLubro; i++)
             {
                 vettLubro[i] = new Lubro(adpConf.Lubro[i]);
-                //mAdapter.AddDataItem(vettLubro[i].mLubroAlias);
                 mAdapter.AddDataItem(vettLubro[i].mLubroNum);
                 mAdapter.AddDataItem(vettLubro[i].mLubroStatus);
             }
@@ -1050,7 +1006,6 @@ namespace MTC_Adapter
             for (int i = 0; i < adpConf.nCooler; i++)
             {
                 vettCooler[i] = new Cooler(adpConf.Cooler[i]);
-                //mAdapter.AddDataItem(vettCooler[i].mCoolAlias);
                 mAdapter.AddDataItem(vettCooler[i].mCoolStatus);
             }
             // Press
@@ -1058,7 +1013,6 @@ namespace MTC_Adapter
             for (int i = 0; i < adpConf.nPress; i++)
             {
                 vettPress[i] = new Press(adpConf.Press[i]);
-                //mAdapter.AddDataItem(vettPress[i].mPressAlias);
                 mAdapter.AddDataItem(vettPress[i].mPressValIst);
             }
             // Temp
@@ -1066,7 +1020,6 @@ namespace MTC_Adapter
             for (int i = 0; i < adpConf.nTemp; i++)
             {
                 vettTempe[i] = new Tempe(adpConf.Temp[i]);
-                //mAdapter.AddDataItem(vettTempe[i].mTempAlias);
                 mAdapter.AddDataItem(vettTempe[i].mTempValIst);
             }
             // Path
@@ -1074,7 +1027,6 @@ namespace MTC_Adapter
             for (int i = 0; i < adpConf.nPath; i++)
             {
                 vettPath[i] = new Path(adpConf.Path[i]);
-                mAdapter.AddDataItem(vettPath[i].mPathAlias);
                 mAdapter.AddDataItem(vettPath[i].mPathFeed);
                 mAdapter.AddDataItem(vettPath[i].mPathFeedOver);
                 mAdapter.AddDataItem(vettPath[i].mPathRapidOver);
@@ -1101,7 +1053,6 @@ namespace MTC_Adapter
                 // aggiungo condizioni allarme...
                 mAdapter.AddDataItem(vettPath[i].mPathAlarmCNC);
                 mAdapter.AddDataItem(vettPath[i].mPathAlarmPLC);
-                // altre aggiunte
             }
             // UnOp
             vettUnOp = new UnOp[adpConf.nUnOp];
@@ -1124,7 +1075,6 @@ namespace MTC_Adapter
             for (int i = 0; i < adpConf.nAxis; i++)
             {
                 vettAxis[i] = new Axis(adpConf.Axis[i]);
-                //mAdapter.AddDataItem(vettAxis[i].mAxAlias);
                 mAdapter.AddDataItem(vettAxis[i].mAxMainProc);
                 mAdapter.AddDataItem(vettAxis[i].mAxIsMaster);
                 mAdapter.AddDataItem(vettAxis[i].mAxMastId);
@@ -1150,13 +1100,8 @@ namespace MTC_Adapter
             mAdapter.AddDataItem(mMessage);
 
             // allarmi "base"
-            //mAdapter.AddDataItem(mAlarmSystem);
             mAdapter.AddDataItem(mAlarmCNC);
             mAdapter.AddDataItem(mAlarmPLC);
-            //mAdapter.AddDataItem(mAlarmHMI);
-            //mAdapter.AddDataItem(mAlarmGeneral);
-
-
 
             // azioni utente
             mAdapter.AddDataItem(mUserAction);
diff --git a/MTC_Adapter/MTC_Adapter/App.SCM-ESA.config b/MTC_Adapter/MTC_Adapter/App.SCM-ESA.config
index 5eaa87c..3523d79 100644
--- a/MTC_Adapter/MTC_Adapter/App.SCM-ESA.config
+++ b/MTC_Adapter/MTC_Adapter/App.SCM-ESA.config
@@ -5,6 +5,8 @@
     <add key="autoLoadConf" value="true" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
     <add key="openDumpOnStart" value="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
     <add key="procIotMem" value="true" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
+    <!--clock di base update...-->
+    <add key="timerIntMs" value="10" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
     <!--COMMENTATO IN DEBUG LOCALE-->
     <add key="startMinimized" value="true" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
     <add key="windowCanMax" value="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
diff --git a/MTC_Adapter/MTC_Adapter/Resources/SCM/Appunti SCM.txt b/MTC_Adapter/MTC_Adapter/Resources/SCM/Appunti SCM.txt
index 1a18e5e..8b8afba 100644
--- a/MTC_Adapter/MTC_Adapter/Resources/SCM/Appunti SCM.txt	
+++ b/MTC_Adapter/MTC_Adapter/Resources/SCM/Appunti SCM.txt	
@@ -13,3 +13,7 @@ TODO
  - semplificare file conf adapter x tutto (tranne assi che serve TYPE LINEAR/ROTARY)
  - completare le aree IOT-STRING
  - eliminare da thdNcEsaGvKvara "vecchie" aree di memoria
+ - aggiungere elementi x AGENT
+   * MemArea_01_PROG_NAME
+   * MemArea_01_NUM_EXE
+   * MemArea_01_NUM_REP
\ No newline at end of file