Sic-Software
/
Sic.Framework
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.Gem优化

This commit is contained in:
HCL 2024-05-30 17:46:34 +08:00
parent 939cc7bde4
commit fe4eaa6920
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MECF.Framework.Common/Aitex/Core/RT/Event/EventManager.cs
View File

@ -563,7 +563,7 @@ namespace Aitex.Core.RT.Event
{
if (GemManager.Instance.Equipment != null)
{
ulong alarmID = GemManager.Instance.Equipment.GetAlarm(module + "Alarm").ALID;
ulong alarmID = GemManager.Instance.Equipment.GetAlarm(module + ".Alarm").ALID;
GemManager.Instance.Equipment?.SetAlarm(alarmID, "", new string[] { module + ".AlarmInfo" }, new object[] { message });
}
}

47
MECF.Framework.Common/MECF/Framework/Common/Gem/GemManager.cs
View File

@ -143,7 +143,7 @@ namespace MECF.Framework.Common.Gem
string equipmentName = SC.GetStringValue("System.EquipmentName");
int equipmentNo = SC.GetValue<int>("System.EquipmentNo");
_equipment = new Kxware.ToolAutomation.Equipment(equipmentName);
_equipment = new Kxware.ToolAutomation.Equipment("SicEquipment");
//_equipment.RegisteringVariables += new RegisterVariableDelegate(RegisteringVariables);
@ -157,6 +157,7 @@ namespace MECF.Framework.Common.Gem
//设置内置名称,软件版本等SV
_equipment.SetValue("MDLN", "Sic");
_equipment.SetValue("Manufacturer", "Sicentury");
_equipment.SetValue("EqpModel", equipmentName);
_equipment.SetValue("EqpSerialNum", equipmentNo.ToString());
//设置Recipes路径
@ -664,25 +665,25 @@ namespace MECF.Framework.Common.Gem
}
break;
//ABORT指令没有附加参数
case "ABORT":
case "STOP":
{
if (RtStatus != "AutoRunning")
{
Kxware.Common.Log.Warn("GEM", $"Cannot perform 'ABORT' command. Equipment State is not in AutoRunning.");
result = enumRemoteCommandAckCode.CannotPerformNow;
}
else
{
Kxware.Common.Log.Info("GEM", $"Received 'ABORT' command.");
result = enumRemoteCommandAckCode.AcknowledgeCommandWillBePerformed;
////ABORT指令没有附加参数
//case "ABORT":
//case "STOP":
// {
// if (RtStatus != "AutoRunning")
// {
// Kxware.Common.Log.Warn("GEM", $"Cannot perform 'ABORT' command. Equipment State is not in AutoRunning.");
// result = enumRemoteCommandAckCode.CannotPerformNow;
// }
// else
// {
// Kxware.Common.Log.Info("GEM", $"Received 'ABORT' command.");
// result = enumRemoteCommandAckCode.AcknowledgeCommandWillBePerformed;
//具体操作
OP.DoOperation("System.Abort");
}
}
break;
// //具体操作
// OP.DoOperation("System.Abort");
// }
// }
// break;
default:
{
@ -770,7 +771,9 @@ namespace MECF.Framework.Common.Gem
{
foreach (var alarm in _equipment?.GetAlarms().Where(a => a.Active))
{
_equipment?.ClearAlarm(alarm.Name, alarm.AdditionalInfo);
//获取变量名
string variableName = alarm.Name + "Info";
_equipment?.ClearAlarm(alarm.Name, alarm.AdditionalInfo, new string[] {variableName}, new object[] {""});
}
return true;
@ -780,7 +783,9 @@ namespace MECF.Framework.Common.Gem
{
foreach (var alarm in _equipment?.GetAlarms().Where(a => a.Name == $"{module}Alarm" && a.Active))
{
_equipment?.ClearAlarm(alarm.Name, alarm.AdditionalInfo);
//获取变量名
string variableName = alarm.Name + "Info";
_equipment?.ClearAlarm(alarm.Name, alarm.AdditionalInfo, new string[] { variableName }, new object[] { "" });
}
return true;