Browse Source

fix 合并minics报警类型

jiangjy 5 days ago
parent
commit
14955471e7

+ 2 - 0
Furnace/FurnaceRT/Config/FurnaceGemModel.xml

@@ -11243,6 +11243,8 @@
     <ALID id="330010885" logicalName="PM1.WaterFlowFS111ToleranceWarning" description="WaterFlowFS111 tolerance warning " category="EquipmentStatusWarning" enabled="false" eventSet="1330010885" eventClear="2330010885" />
     <ALID id="330010886" logicalName="PM1.WaterFlowFS116ToleranceAlarm" description="WaterFlowFS116 tolerance alarm " category="EquipmentStatusWarning" enabled="false" eventSet="1330010886" eventClear="2330010886" />
     <ALID id="330010887" logicalName="PM1.WaterFlowFS116ToleranceWarning" description="WaterFlowFS116 tolerance warning " category="EquipmentStatusWarning" enabled="false" eventSet="1330010887" eventClear="2330010887" />
+    <ALID id="330010888" logicalName="PM1.ForLineOverTempAlarm" description="" category="EquipmentStatusWarning" enabled="false" eventSet="1330010888" eventClear="2330010888" />
+    <ALID id="330010889" logicalName="PM1.GasLineOverTempAlarm" description="" category="EquipmentStatusWarning" enabled="false" eventSet="1330010889" eventClear="2330010889" />
     <ALID id="860010001" logicalName="WaferRobot.AlarmSignaWaferRobotTPStatusWarning" description="Wafer Robot TP Status Warning Trigger " category="EquipmentStatusWarning" enabled="false" eventSet="1860010001" eventClear="2860010001" />
     <ALID id="860010002" logicalName="WaferRobot.BladeWaferNotPresentWarning" description="Blade wafer not present " category="EquipmentStatusWarning" enabled="false" eventSet="1860010002" eventClear="2860010002" />
     <ALID id="860010003" logicalName="WaferRobot.BladeWaferPresentWarning" description="Blade wafer present " category="EquipmentStatusWarning" enabled="false" eventSet="1860010003" eventClear="2860010003" />

File diff suppressed because it is too large
+ 1 - 1185
Furnace/FurnaceRT/Config/VIDs/_ALID.xml


+ 8 - 2
Furnace/FurnaceRT/Equipments/PMs/PMAlarmCondition.cs

@@ -1,5 +1,6 @@
 using Aitex.Core.Common.DeviceData;
 using Aitex.Core.RT.DataCenter;
+using Aitex.Core.RT.Device;
 using Aitex.Core.RT.Device.Unit;
 using Aitex.Core.RT.Event;
 using Aitex.Core.RT.IOCore;
@@ -13,6 +14,7 @@ using DocumentFormat.OpenXml.Drawing.Charts;
 using FurnaceRT.Equipments.PMs.RecipeExecutions;
 using FurnaceRT.Equipments.Systems;
 using MECF.Framework.Common.CommonData.EnumData;
+using MECF.Framework.Common.Device.Bases;
 using MECF.Framework.Common.Equipment;
 using MECF.Framework.Common.Event;
 using MECF.Framework.Common.OperationCenter;
@@ -1009,11 +1011,15 @@ namespace FurnaceRT.Equipments.PMs
                     _processRoutine.PauseRecipe();
                     LOG.Write($"Alarm condition: command={command}");
                     break;
-                case "Monitor":
+                case "Monitor"://蜂鸣器不需要响
                     eventHandler?.Invoke();
+                    DEVICE.GetDevice<SignalTowerBase>("System.SignalTower")?.SwitchOffBuzzer(true);
+                    Singleton<EquipmentManager>.Instance.IsAlarmConditionBuzzerOn = false;
                     LOG.Write($"Alarm condition: command={command}");
                     break;
-                case "Buzzer":
+                case "Buzzer"://蜂鸣器需要响且报警
+                    eventHandler?.Invoke();
+                    DEVICE.GetDevice<SignalTowerBase>("System.SignalTower")?.SwitchOffBuzzer(false);
                     Singleton<EquipmentManager>.Instance.IsAlarmConditionBuzzerOn = true;
                     LOG.Write($"Alarm condition: command={command}");
                     break;

+ 1 - 1
Furnace/FurnaceRT/Equipments/PMs/PMModule.cs

@@ -325,10 +325,10 @@ namespace FurnaceRT.Equipments.PMs
         private void InitData()
         {
             DATA.Subscribe($"{Module}.IsError", () => IsError);
+            DATA.Subscribe($"{Module}.IsProcessing", () => IsProcessing);
 
             DATA.Subscribe($"{Module}.Status", () => StringFsmStatus);
             DATA.Subscribe($"{Module}.IsOnline", () => IsOnline);
-            DATA.Subscribe($"{Module}.IsProcessing", () => IsProcessing);
             DATA.Subscribe($"{Module}.RunningModeIsDebug", () => GetRunningModeIsDebug());
             DATA.Subscribe($"{Module}.EnableMinics", () => SC.ContainsItem("Minics.EnableMinics") ? SC.GetValue<bool>("Minics.EnableMinics") : false);