Egalware/CMS-MTConn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corretta gestione strobe allarmi, aggiunta valorizzazione x assi

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-05-20 17:15:05 +02:00
parent 0fba8fadd9
commit 212782c8cb
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MTC_Sim/MTC_Sim/AdapterFanuc.cs
+16 -14
View File
@@ -632,21 +632,20 @@ namespace MTC_Sim
sb.AppendLine(string.Format("FeedRate: {0} mm/min", FeedRate));
// se ho allarmi li accodo...
//if (allDynData.alarm != 0)
//{
if (allDynData.alarm != 0)
{
sb.AppendLine(string.Format("Allarmi CNC: {0}", allDynData.alarm));
inizio = DateTime.Now;
allarmiCNC = FANUC_ref.getCncAlarm();
if (utils.CRB("recTime")) TimingData.addResult("R-CNC-ALARMS", DateTime.Now.Subtract(inizio).Ticks);
checkCNCAlarms();
//}
//else
//{
// mAlarmCNC.Normal();
//}
}
else
{
allarmiCNC = new CMSCncLib.Focas1.ODBALMMSG2();
}
parentForm.dataMonitor = sb.ToString();
}
@@ -689,13 +688,16 @@ namespace MTC_Sim
//if (utils.CRB("verbose")) sb.AppendLine(string.Format("Allarmi CNC: NUM {0} | MESS: {1} | ASSE: {2} | TYPE: {3}", allarme.alm_no, allarme.alm_msg, allarme.axis, allarme.type));
// se ho asse accodo ad asse altrimenti no...
//if (allarme.axis == 0)
//{
string codAllarme = string.Format("T{0}-N{1}", allarme.type, allarme.alm_no);
mAlarmCNC.Add(MTConnect.Condition.Level.FAULT, allarme.alm_msg, codAllarme, "", "");
//}
//else
//{ }
if (allarme.axis == 0)
{
mAlarmCNC.Add(MTConnect.Condition.Level.FAULT, allarme.alm_msg, codAllarme, "", "");
}
else
{
vettAxis[allarme.axis].mAxAlarmCNC.Add(MTConnect.Condition.Level.FAULT, allarme.alm_msg, codAllarme, "", "");
}
}
}