diff --git a/AgentBin/simulator/CMS_DEMO.xml b/AgentBin/simulator/CMS_DEMO.xml
index 300e675..0ad5e1a 100644
--- a/AgentBin/simulator/CMS_DEMO.xml
+++ b/AgentBin/simulator/CMS_DEMO.xml
@@ -200,6 +200,7 @@
+
diff --git a/AgentBin/simulator/SCM_DEMO.xml b/AgentBin/simulator/SCM_DEMO.xml
index bcb9315..e6943d9 100644
--- a/AgentBin/simulator/SCM_DEMO.xml
+++ b/AgentBin/simulator/SCM_DEMO.xml
@@ -200,6 +200,7 @@
+
diff --git a/MTC_Sim/MTC_Sim/AdapterConf.cs b/MTC_Sim/MTC_Sim/AdapterConf.cs
index 1eb407f..62fbf51 100644
--- a/MTC_Sim/MTC_Sim/AdapterConf.cs
+++ b/MTC_Sim/MTC_Sim/AdapterConf.cs
@@ -7,6 +7,7 @@ using System.Xml.Serialization;
namespace MTC_Adapter
{
#region -- AdapterConf Class --
+
///
/// This Configuration class is basically just a set of
/// properties with a couple of static methods to manage
diff --git a/MTC_Sim/MTC_Sim/AdapterFanuc.cs b/MTC_Sim/MTC_Sim/AdapterFanuc.cs
index 36bd692..224801d 100644
--- a/MTC_Sim/MTC_Sim/AdapterFanuc.cs
+++ b/MTC_Sim/MTC_Sim/AdapterFanuc.cs
@@ -835,10 +835,8 @@ namespace MTC_Adapter
SpeedRate = BitConverter.ToUInt16(unOpSpeedMem, 2 * i);
vettUnOp[i].mUnOpSpeed.Value = SpeedRate;
- //vettUnOp[i].mUnOpToolId.Value = uoData.UnOpToolId;
//vettUnOp[i].mUnOpNumCU.Value = uoData.UnOpNumCU;
//vettUnOp[i].mUnOpStatus.Value = uoData.UnOpStatus;
- //vettUnOp[i].mUnOpVitaRes.Value = uoData.UnOpVitaRes;
//vettUnOp[i].mUnOpLoad.Value = spindleVect.data[i];
//vettUnOp[i].mUnOpAccTime.Value = uoData.UnOpAccTime;
@@ -972,6 +970,22 @@ namespace MTC_Adapter
{
vettUnOp[i].mUnOpToolId.Value = idUtMontato[i];
vettUnOp[i].mUnOpVitaRes.Value = valVitaUtRes[i];
+ // decodifico valore tipo VitaRes...
+ string tipoVitaRes = "ND";
+ switch(idTipoVitaUt[i])
+ {
+ case 1:
+ tipoVitaRes = "Time";
+ break;
+ case 2:
+ tipoVitaRes = "Stroke";
+ break;
+ case 3:
+ tipoVitaRes = "Distance";
+ break;
+ default: break;
+ }
+ vettUnOp[i].mUnOpVitaResType.Value = tipoVitaRes;
}
}
diff --git a/MTC_Sim/MTC_Sim/AdapterGeneric.cs b/MTC_Sim/MTC_Sim/AdapterGeneric.cs
index 3f14b56..1f1ce31 100644
--- a/MTC_Sim/MTC_Sim/AdapterGeneric.cs
+++ b/MTC_Sim/MTC_Sim/AdapterGeneric.cs
@@ -366,6 +366,14 @@ namespace MTC_Adapter
///
public Event mUnOpVitaRes;
///
+ /// tipologia di vita residua utensile:
+ /// 0 : "ND" (famiglia senza gestione vitautensili)
+ /// 1 : "Time [s]"
+ /// 2 : "Stroke [n]"
+ /// 3 : "Distance [m]" ([ft] se la macchina รจ impostata in pollici)
+ ///
+ public Event mUnOpVitaResType;
+ ///
/// valore speed
///
public Sample mUnOpSpeed;
@@ -397,6 +405,7 @@ namespace MTC_Adapter
mUnOpSpeed = new Sample(dataRefList[4].Key);
mUnOpLoad = new Sample(dataRefList[5].Key);
mUnOpAccTime = new Sample(dataRefList[6].Key);
+ mUnOpVitaResType = new Event(dataRefList[7].Key);
}
}
///
@@ -960,6 +969,7 @@ namespace MTC_Adapter
mAdapter.AddDataItem(vettUnOp[i].mUnOpNumCU);
mAdapter.AddDataItem(vettUnOp[i].mUnOpStatus);
mAdapter.AddDataItem(vettUnOp[i].mUnOpVitaRes);
+ mAdapter.AddDataItem(vettUnOp[i].mUnOpVitaResType);
mAdapter.AddDataItem(vettUnOp[i].mUnOpSpeed);
mAdapter.AddDataItem(vettUnOp[i].mUnOpLoad);
mAdapter.AddDataItem(vettUnOp[i].mUnOpAccTime);
diff --git a/MTC_Sim/MTC_Sim/SetupAdapter.cs b/MTC_Sim/MTC_Sim/SetupAdapter.cs
index d069c91..95e2781 100644
--- a/MTC_Sim/MTC_Sim/SetupAdapter.cs
+++ b/MTC_Sim/MTC_Sim/SetupAdapter.cs
@@ -384,6 +384,7 @@ namespace MTC_Adapter
listaDR.Add(new DataRefItem(string.Format("UnOp_{0:00}_Speed", i + 1), "0"));
listaDR.Add(new DataRefItem(string.Format("UnOp_{0:00}_Load", i + 1), "0"));
listaDR.Add(new DataRefItem(string.Format("UnOp_{0:00}_AccTime", i + 1), "0"));
+ listaDR.Add(new DataRefItem(string.Format("UnOp_{0:00}_VitaResType", i + 1), "0"));
UnOp[i] = new element(string.Format("UnOp_{0:00}", i + 1), string.Format("Unita Op num {0}", i + 1), fonteDati.Random, listaDR);
}
// salvo oggetto