diff --git a/AgentBin/simulator/CMS_DEMO.xml b/AgentBin/simulator/CMS_DEMO.xml
index 1a42b2c..4a50c7b 100644
--- a/AgentBin/simulator/CMS_DEMO.xml
+++ b/AgentBin/simulator/CMS_DEMO.xml
@@ -38,6 +38,8 @@
+
+
@@ -59,6 +61,8 @@
+
+
@@ -80,6 +84,8 @@
+
+
@@ -101,6 +107,8 @@
+
+
@@ -120,6 +128,8 @@
+
+
@@ -138,6 +148,8 @@
+
+
diff --git a/MTC_Sim/MTC_Sim/AdapterConf/CMS_FANUC.xml b/MTC_Sim/MTC_Sim/AdapterConf/CMS_FANUC.xml
index e8a1c26..8b03bbc 100644
--- a/MTC_Sim/MTC_Sim/AdapterConf/CMS_FANUC.xml
+++ b/MTC_Sim/MTC_Sim/AdapterConf/CMS_FANUC.xml
@@ -11,7 +11,7 @@
VacPump_01_Status
- 0#7
+
@@ -22,7 +22,7 @@
VacPump_02_Status
- 0#7
+
@@ -107,7 +107,7 @@
Press_01_Value
- 0#7
+
@@ -118,7 +118,7 @@
Press_02_Value
- 0#7
+
@@ -131,7 +131,7 @@
Temp_01_Value
- 0#7
+
@@ -142,7 +142,7 @@
Temp_02_Value
- 0#7
+
@@ -252,31 +252,31 @@
UnOp_01_ToolId
- 0#7
+
UnOp_01_NumCU
- 8#15
+
UnOp_01_Status
- 16#23
+
UnOp_01_VitaRes
- 24#31
+
UnOp_01_Speed
- 32#39
+
UnOp_01_Load
- 40#47
+
UnOp_01_AccTime
- 48#55
+
@@ -289,55 +289,63 @@
Axis_01_MainProc
- 0#7
+
Axis_01_IsMast
- 8#15
+
Axis_01_MastId
- 16#23
+
Axis_01_Type
- 24#31
+
Axis_01_Dir
- 32#39
+
Axis_01_Load
- 40#47
+
Axis_01_PosAct
- 48#55
+
Axis_01_PosTgt
- 56#63
+
Axis_01_FeedAct
- 64#71
+
Axis_01_FeedOver
- 72#79
+
Axis_01_AccelAct
- 80#87
+
Axis_01_AccTime
- 88#95
+
Axis_01_Battery
- 96#103
+
+
+
+ Axis_01_DistDone
+
+
+
+ Axis_01_InvDDone
+
@@ -348,55 +356,63 @@
Axis_02_MainProc
- 0#7
+
Axis_02_IsMast
- 8#15
+
Axis_02_MastId
- 16#23
+
Axis_02_Type
- 24#31
+
Axis_02_Dir
- 32#39
+
Axis_02_Load
- 40#47
+
Axis_02_PosAct
- 48#55
+
Axis_02_PosTgt
- 56#63
+
Axis_02_FeedAct
- 64#71
+
Axis_02_FeedOver
- 72#79
+
Axis_02_AccelAct
- 80#87
+
Axis_02_AccTime
- 88#95
+
Axis_02_Battery
- 96#103
+
+
+
+ Axis_02_DistDone
+
+
+
+ Axis_02_InvDDone
+
@@ -407,55 +423,63 @@
Axis_03_MainProc
- 0#7
+
Axis_03_IsMast
- 8#15
+
Axis_03_MastId
- 16#23
+
Axis_03_Type
- 24#31
+
Axis_03_Dir
- 32#39
+
Axis_03_Load
- 40#47
+
Axis_03_PosAct
- 48#55
+
Axis_03_PosTgt
- 56#63
+
Axis_03_FeedAct
- 64#71
+
Axis_03_FeedOver
- 72#79
+
Axis_03_AccelAct
- 80#87
+
Axis_03_AccTime
- 88#95
+
Axis_03_Battery
- 96#103
+
+
+
+ Axis_03_DistDone
+
+
+
+ Axis_03_InvDDone
+
@@ -466,55 +490,63 @@
Axis_04_MainProc
- 0#7
+
Axis_04_IsMast
- 8#15
+
Axis_04_MastId
- 16#23
+
Axis_04_Type
- 24#31
+
Axis_04_Dir
- 32#39
+
Axis_04_Load
- 40#47
+
Axis_04_PosAct
- 48#55
+
Axis_04_PosTgt
- 56#63
+
Axis_04_FeedAct
- 64#71
+
Axis_04_FeedOver
- 72#79
+
Axis_04_AccelAct
- 80#87
+
Axis_04_AccTime
- 88#95
+
Axis_04_Battery
- 96#103
+
+
+
+ Axis_04_DistDone
+
+
+
+ Axis_04_InvDDone
+
@@ -525,55 +557,63 @@
Axis_05_MainProc
- 0#7
+
Axis_05_IsMast
- 8#15
+
Axis_05_MastId
- 16#23
+
Axis_05_Type
- 24#31
+
Axis_05_Dir
- 32#39
+
Axis_05_Load
- 40#47
+
Axis_05_PosAct
- 48#55
+
Axis_05_PosTgt
- 56#63
+
Axis_05_FeedAct
- 64#71
+
Axis_05_FeedOver
- 72#79
+
Axis_05_AccelAct
- 80#87
+
Axis_05_AccTime
- 88#95
+
Axis_05_Battery
- 96#103
+
+
+
+ Axis_05_DistDone
+
+
+
+ Axis_05_InvDDone
+
@@ -584,55 +624,63 @@
Axis_06_MainProc
- 0#7
+
Axis_06_IsMast
- 8#15
+
Axis_06_MastId
- 16#23
+
Axis_06_Type
- 24#31
+
Axis_06_Dir
- 32#39
+
Axis_06_Load
- 40#47
+
Axis_06_PosAct
- 48#55
+
Axis_06_PosTgt
- 56#63
+
Axis_06_FeedAct
- 64#71
+
Axis_06_FeedOver
- 72#79
+
Axis_06_AccelAct
- 80#87
+
Axis_06_AccTime
- 88#95
+
Axis_06_Battery
- 96#103
+
+
+
+ Axis_06_DistDone
+
+
+
+ Axis_06_InvDDone
+
diff --git a/MTC_Sim/MTC_Sim/SetupAdapter.cs b/MTC_Sim/MTC_Sim/SetupAdapter.cs
index f9a1ee1..12d7852 100644
--- a/MTC_Sim/MTC_Sim/SetupAdapter.cs
+++ b/MTC_Sim/MTC_Sim/SetupAdapter.cs
@@ -234,7 +234,7 @@ namespace MTC_Sim
{
// inizializzo list x parametri
listaDR = new List>();
- listaDR.Add(new DataRefItem(string.Format("VacPump_{0:00}_Status", i + 1), "0#7"));
+ listaDR.Add(new DataRefItem(string.Format("VacPump_{0:00}_Status", i + 1), ""));
VacuumPump[i] = new element(string.Format("VacPump_{0:00}", i + 1), string.Format("Pompa {0}", i + 1), fonteDati.Random, listaDR);
}
// salvo oggetto
@@ -302,7 +302,7 @@ namespace MTC_Sim
{
// inizializzo list x parametri
listaDR = new List>();
- listaDR.Add(new DataRefItem(string.Format("Press_{0:00}_Value", i + 1), "0#7"));
+ listaDR.Add(new DataRefItem(string.Format("Press_{0:00}_Value", i + 1), ""));
Press[i] = new element(string.Format("Press_{0:00}", i + 1), string.Format("Pressostato {0}", i + 1), fonteDati.Random, listaDR);
}
// salvo oggetto
@@ -319,7 +319,7 @@ namespace MTC_Sim
{
// inizializzo list x parametri
listaDR = new List>();
- listaDR.Add(new DataRefItem(string.Format("Temp_{0:00}_Value", i + 1), "0#7"));
+ listaDR.Add(new DataRefItem(string.Format("Temp_{0:00}_Value", i + 1), ""));
Temp[i] = new element(string.Format("Temp_{0:00}", i + 1), string.Format("Sonda Temperatura {0}", i + 1), fonteDati.Random, listaDR);
}
// salvo oggetto
@@ -377,13 +377,13 @@ namespace MTC_Sim
{
// inizializzo list x parametri
listaDR = new List>();
- listaDR.Add(new DataRefItem(string.Format("UnOp_{0:00}_ToolId", i + 1), "0#7"));
- listaDR.Add(new DataRefItem(string.Format("UnOp_{0:00}_NumCU", i + 1), "8#15"));
- listaDR.Add(new DataRefItem(string.Format("UnOp_{0:00}_Status", i + 1), "16#23"));
- listaDR.Add(new DataRefItem(string.Format("UnOp_{0:00}_VitaRes", i + 1), "24#31"));
- listaDR.Add(new DataRefItem(string.Format("UnOp_{0:00}_Speed", i + 1), "32#39"));
- listaDR.Add(new DataRefItem(string.Format("UnOp_{0:00}_Load", i + 1), "40#47"));
- listaDR.Add(new DataRefItem(string.Format("UnOp_{0:00}_AccTime", i + 1), "48#55"));
+ listaDR.Add(new DataRefItem(string.Format("UnOp_{0:00}_ToolId", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("UnOp_{0:00}_NumCU", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("UnOp_{0:00}_Status", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("UnOp_{0:00}_VitaRes", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("UnOp_{0:00}_Speed", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("UnOp_{0:00}_Load", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("UnOp_{0:00}_AccTime", i + 1), ""));
UnOp[i] = new element(string.Format("UnOp_{0:00}", i + 1), string.Format("Unita Op num {0}", i + 1), fonteDati.Random, listaDR);
}
// salvo oggetto
@@ -400,19 +400,21 @@ namespace MTC_Sim
{
// inizializzo list x parametri
listaDR = new List>();
- listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_MainProc", i + 1), "0#7"));
- listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_IsMast", i + 1), "8#15"));
- listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_MastId", i + 1), "16#23"));
- listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_Type", i + 1), "24#31"));
- listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_Dir", i + 1), "32#39"));
- listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_Load", i + 1), "40#47"));
- listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_PosAct", i + 1), "48#55"));
- listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_PosTgt", i + 1), "56#63"));
- listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_FeedAct", i + 1), "64#71"));
- listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_FeedOver", i + 1), "72#79"));
- listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_AccelAct", i + 1), "80#87"));
- listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_AccTime", i + 1), "88#95"));
- listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_Battery", i + 1), "96#103"));
+ listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_MainProc", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_IsMast", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_MastId", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_Type", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_Dir", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_Load", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_PosAct", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_PosTgt", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_FeedAct", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_FeedOver", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_AccelAct", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_AccTime", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_Battery", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_DistDone", i + 1), ""));
+ listaDR.Add(new DataRefItem(string.Format("Axis_{0:00}_InvDDone", i + 1), ""));
Axis[i] = new element(string.Format("Axis_{0:00}", i + 1), string.Format("Asse num {0}", i + 1), fonteDati.Random, listaDR);
}
// salvo oggetto