diff --git a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs index 265b9a9..ed65772 100644 --- a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs +++ b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs @@ -46,11 +46,10 @@ namespace MTC_Adapter fonte = baseElem.fonte; dataRefList = baseElem.dataRefList; - // genero elementi specifici MTConnect mVacPumpAlias = new Event(string.Format("{0}_Alias", ident)); mVacPumpAlias.Value = alias; - mVacPumpStatus = new Event(dataRefList[0].Key); - mVacPumpWrkTime = new Event(dataRefList[1].Key); + mVacPumpStatus = new Event(string.Format("{0}_Status", ident)); + mVacPumpWrkTime = new Event(string.Format("{0}_WrkTime", ident)); } } /// @@ -66,7 +65,6 @@ namespace MTC_Adapter /// valore numero attivazioni/disattivazioni valvola /// public Event mVacActCount; - /// /// Classe Vacuum Actuator (valvola) /// @@ -80,7 +78,7 @@ namespace MTC_Adapter mVacActAlias = new Event(string.Format("{0}_Alias", ident)); mVacActAlias.Value = alias; - mVacActCount = new Event(dataRefList[0].Key); + mVacActCount = new Event(string.Format("{0}_Count", ident)); } } /// diff --git a/MTC_Adapter/MTC_Adapter/DATA/CONF/Adapter_ItemList.xml b/MTC_Adapter/MTC_Adapter/DATA/CONF/Adapter_ItemList.xml index 4d50023..2585993 100644 --- a/MTC_Adapter/MTC_Adapter/DATA/CONF/Adapter_ItemList.xml +++ b/MTC_Adapter/MTC_Adapter/DATA/CONF/Adapter_ItemList.xml @@ -9,78 +9,40 @@ VacPump_01 Pompa 1 - Random - - - VacPump_01_Status - 0 - - - VacPump_01_WrkTime - 0 - - + MemLoad + VacPump_02 Pompa 2 - Random - - - VacPump_02_Status - 0 - - - VacPump_02_WrkTime - 0 - - + MemLoad + VacAct_01 Attuatore vuoto 1 - Random - - - VacAct_01_Count - 0 - - + MemLoad + VacAct_02 Attuatore vuoto 2 - Random - - - VacAct_02_Count - 0 - - + MemLoad + VacAct_03 Attuatore vuoto 3 - Random - - - VacAct_03_Count - 0 - - + MemLoad + VacAct_04 Attuatore vuoto 4 - Random - - - VacAct_04_Count - 0 - - + MemLoad + diff --git a/MTC_Adapter/MTC_Adapter/Resources/SCM/SCM_ESA.xml b/MTC_Adapter/MTC_Adapter/Resources/SCM/SCM_ESA.xml index 4d50023..2585993 100644 --- a/MTC_Adapter/MTC_Adapter/Resources/SCM/SCM_ESA.xml +++ b/MTC_Adapter/MTC_Adapter/Resources/SCM/SCM_ESA.xml @@ -9,78 +9,40 @@ VacPump_01 Pompa 1 - Random - - - VacPump_01_Status - 0 - - - VacPump_01_WrkTime - 0 - - + MemLoad + VacPump_02 Pompa 2 - Random - - - VacPump_02_Status - 0 - - - VacPump_02_WrkTime - 0 - - + MemLoad + VacAct_01 Attuatore vuoto 1 - Random - - - VacAct_01_Count - 0 - - + MemLoad + VacAct_02 Attuatore vuoto 2 - Random - - - VacAct_02_Count - 0 - - + MemLoad + VacAct_03 Attuatore vuoto 3 - Random - - - VacAct_03_Count - 0 - - + MemLoad + VacAct_04 Attuatore vuoto 4 - Random - - - VacAct_04_Count - 0 - - + MemLoad + diff --git a/MTC_Adapter/MTC_Adapter/SetupAdapter.cs b/MTC_Adapter/MTC_Adapter/SetupAdapter.cs index 6fd4830..a8810ad 100644 --- a/MTC_Adapter/MTC_Adapter/SetupAdapter.cs +++ b/MTC_Adapter/MTC_Adapter/SetupAdapter.cs @@ -283,9 +283,7 @@ namespace MTC_Adapter { // inizializzo list x parametri listaDR = new List>(); - listaDR.Add(new DataRefItem(string.Format("VacPump_{0:00}_Status", i + 1), "0")); - listaDR.Add(new DataRefItem(string.Format("VacPump_{0:00}_WrkTime", i + 1), "0")); - VacuumPump[i] = new element(string.Format("VacPump_{0:00}", i + 1), string.Format("Pompa {0}", i + 1), fonteDati.Random, listaDR); + VacuumPump[i] = new element(string.Format("VacPump_{0:00}", i + 1), string.Format("Pompa {0}", i + 1), fonteDati.MemLoad, listaDR); } // salvo oggetto c.VacuumPump = VacuumPump; @@ -301,8 +299,7 @@ namespace MTC_Adapter { // inizializzo list x parametri listaDR = new List>(); - listaDR.Add(new DataRefItem(string.Format("VacAct_{0:00}_Count", i + 1), "0")); - VacuumAct[i] = new element(string.Format("VacAct_{0:00}", i + 1), string.Format("Attuatore vuoto {0}", i + 1), fonteDati.Random, listaDR); + VacuumAct[i] = new element(string.Format("VacAct_{0:00}", i + 1), string.Format("Attuatore vuoto {0}", i + 1), fonteDati.MemLoad, listaDR); } // salvo oggetto c.VacuumAct = VacuumAct;