diff --git a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs index ea06e39..265b9a9 100644 --- a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs +++ b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs @@ -100,7 +100,6 @@ namespace MTC_Adapter /// Status /// public Event mLubroStatus; - /// /// Classe Lubrorefrigerante /// @@ -114,7 +113,7 @@ namespace MTC_Adapter mLubroAlias = new Event(string.Format("{0}_Alias", ident)); mLubroAlias.Value = alias; - mLubroNum = new Event(dataRefList[0].Key); + mLubroNum = new Event(string.Format("{0}_Num", ident)); mLubroStatus = new Event(string.Format("{0}_Status", ident)); } } @@ -131,7 +130,6 @@ namespace MTC_Adapter /// Stato istantaneo (evento aperto/chiuso) /// public Event mCoolStatus; - /// /// Classe refrigeratore /// @@ -145,7 +143,7 @@ namespace MTC_Adapter mCoolAlias = new Event(string.Format("{0}_Alias", ident)); mCoolAlias.Value = alias; - mCoolStatus = new Event(dataRefList[0].Key); + mCoolStatus = new Event(string.Format("{0}_Status", ident)); } } /// diff --git a/MTC_Adapter/MTC_Adapter/DATA/CONF/Adapter_ItemList.xml b/MTC_Adapter/MTC_Adapter/DATA/CONF/Adapter_ItemList.xml index b1de58b..4d50023 100644 --- a/MTC_Adapter/MTC_Adapter/DATA/CONF/Adapter_ItemList.xml +++ b/MTC_Adapter/MTC_Adapter/DATA/CONF/Adapter_ItemList.xml @@ -87,48 +87,28 @@ Lubro_01 Lubrorefrigerante 1 - Random - - - Lubro_01_Num - 0 - - + MemLoad + Lubro_02 Lubrorefrigerante 2 - Random - - - Lubro_02_Num - 0 - - + MemLoad + Cooler_01 Cooler 1 - Random - - - Cooler_01_Status - 0 - - + MemLoad + Cooler_02 Cooler 2 - Random - - - Cooler_02_Status - 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 b1de58b..4d50023 100644 --- a/MTC_Adapter/MTC_Adapter/Resources/SCM/SCM_ESA.xml +++ b/MTC_Adapter/MTC_Adapter/Resources/SCM/SCM_ESA.xml @@ -87,48 +87,28 @@ Lubro_01 Lubrorefrigerante 1 - Random - - - Lubro_01_Num - 0 - - + MemLoad + Lubro_02 Lubrorefrigerante 2 - Random - - - Lubro_02_Num - 0 - - + MemLoad + Cooler_01 Cooler 1 - Random - - - Cooler_01_Status - 0 - - + MemLoad + Cooler_02 Cooler 2 - Random - - - Cooler_02_Status - 0 - - + MemLoad + diff --git a/MTC_Adapter/MTC_Adapter/SetupAdapter.cs b/MTC_Adapter/MTC_Adapter/SetupAdapter.cs index 7b80b30..6fd4830 100644 --- a/MTC_Adapter/MTC_Adapter/SetupAdapter.cs +++ b/MTC_Adapter/MTC_Adapter/SetupAdapter.cs @@ -318,8 +318,7 @@ namespace MTC_Adapter { // inizializzo list x parametri listaDR = new List>(); - listaDR.Add(new DataRefItem(string.Format("Lubro_{0:00}_Num", i + 1), "0")); - Lubro[i] = new element(string.Format("Lubro_{0:00}", i + 1), string.Format("Lubrorefrigerante {0}", i + 1), fonteDati.Random, listaDR); + Lubro[i] = new element(string.Format("Lubro_{0:00}", i + 1), string.Format("Lubrorefrigerante {0}", i + 1), fonteDati.MemLoad, listaDR); } // salvo oggetto c.Lubro = Lubro; @@ -335,8 +334,7 @@ namespace MTC_Adapter { // inizializzo list x parametri listaDR = new List>(); - listaDR.Add(new DataRefItem(string.Format("Cooler_{0:00}_Status", i + 1), "0")); - Cooler[i] = new element(string.Format("Cooler_{0:00}", i + 1), string.Format("Cooler {0}", i + 1), fonteDati.Random, listaDR); + Cooler[i] = new element(string.Format("Cooler_{0:00}", i + 1), string.Format("Cooler {0}", i + 1), fonteDati.MemLoad, listaDR); } // salvo oggetto c.Cooler = Cooler;