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

Merge branch 'develop' of http://112.124.35.216:65000/Sic-Software/MoS2 into develop

Browse Source
This commit is contained in:
SIC1016\caipeilun 2026-08-14 18:25:29 +08:00
commit e4c7ada86d
10 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
View File

@ -407,7 +407,7 @@
<DoSensor id="CleanRoutineSucceed" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" do="DO_CleanRoutineSuscessed" infoText="" warningText="" alarmText="" />
</DoSensors>
<IoSensors classType="Aitex.Core.RT.Device.Devices.IoSensor" assembly="MECF.Framework.RT.EquipmentLibrary">
<!--<IoSensors classType="Aitex.Core.RT.Device.Devices.IoSensor" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoSensor id="SensorChamCabDoorClosed" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_ChamCabDoorClosed" infoText="" warningText="Warning1 Chamber Cab Door Not Closed [DI-3]" alarmText="" />
<IoSensor id="SensorDORPressVacSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_DORPressVacSW" infoText="Information2 DOR Press Vac [DI-6]" warningText="" alarmText="" />
<IoSensor id="SensorDORPressATMSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_DORPressATMSW" infoText="" warningText="Warning2 DOR Press ATM [DI-7]" alarmText="" />
@ -585,12 +585,12 @@
<IoSensor id="SensorMiddleLidTighten" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_MiddleLidTighten" infoText="Information29 Middle.Lid.Tighten[DI-119]" warningText="" alarmText="" />
<IoSensor id="SensorMiddleLidSwingLock" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_MiddleLidSwingLock" infoText="Information30 Middle.Lid.Swing.Lock[DI-121]" warningText="" alarmText="" />
<IoSensor id="SensorMiddleLidSwingUnlock" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_MiddleLidSwingUnlock" infoText="Information31 Middle.Lid.Swing.Unlock[DI-122]" warningText="" alarmText="" />
<!--<IoSensor id="SensorPSUInnerTempLAlarm" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_PSUInnerTempLAlarm" infoText="Information32 PSU.Inner.Temp Low[DI-308]" warningText="" alarmText="" />
--><!--<IoSensor id="SensorPSUInnerTempLAlarm" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_PSUInnerTempLAlarm" infoText="Information32 PSU.Inner.Temp Low[DI-308]" warningText="" alarmText="" />
<IoSensor id="SensorPSUMiddleTempLAlarm" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_PSUMiddleTempLAlarm" infoText="Information33 PSU.Middle.Temp Low[DI-309]" warningText="" alarmText="" />
<IoSensor id="SensorPSUOuterTempLAlarm" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_PSUOuterTempLAlarm" infoText="Information34 PSU.Outer.TempLow[DI-310]" warningText="" alarmText="" />
<IoSensor id="SensorSCRUpperTempLAlarm" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_SCRUpperTempLAlarm" infoText="Information35 SCR.Upper.Temp Low[DI-314]" warningText="" alarmText="" />
<IoSensor id="SensorSCRMiddleTempLAlarm" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_SCRMiddleTempLAlarm" infoText="Information36 SCR.Middle.Temp Low[DI-315]" warningText="" alarmText="" />
<IoSensor id="SensorSCRLowerTempLAlarm" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_SCRLowerTempLAlarm" infoText="Information37 SCR.Lower.Temp Low[DI-316]" warningText="" alarmText="" />-->
<IoSensor id="SensorSCRLowerTempLAlarm" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_SCRLowerTempLAlarm" infoText="Information37 SCR.Lower.Temp Low[DI-316]" warningText="" alarmText="" />--><!--
<IoSensor id="SensorConfinementRingServoON" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_ConfinementRingServoON" infoText="Information38 ConfinementRingServoON [DI-337]" warningText="" alarmText="" />
<IoSensor id="SensorServoReady" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_ServoReady" infoText="Information39 Servo Not Ready [DI-288]" warningText="" alarmText="" />
<IoSensor id="SensorPSU1Status" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PSU1Status" infoText="Information40 PSU1 Status Is Off[DI-296]" warningText="" alarmText="" />
@ -600,7 +600,7 @@
<IoSensor id="SensorSCR2Status" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_SCR2Status" infoText="Information44 SCR2 Status Is Off[DI-303]" warningText="" alarmText="" />
<IoSensor id="SensorSCR3Status" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_SCR3Status" infoText="Information45 SCR3 Status Is Off[DI-304]" warningText="" alarmText="" />
<IoSensor id="SensorPumpCabDoorClosed" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PumpCabDoorClosed" infoText="Information46 PumpCabDoor Not Closed [DI-71]" warningText="" alarmText="" />
</IoSensors>
</IoSensors>-->
<SicServos classType="Aitex.Core.RT.Device.Devices.SicServo" assembly="MECF.Framework.RT.EquipmentLibrary">
<SicServo id="PMServo" module="" display="PMServo" schematicId="PMServo" unit="" aioType="float"
@ -648,7 +648,7 @@
</IoHeartBeats>
<IoInterLocks classType="Aitex.Core.RT.Device.Devices.IoInterLock" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoInterLock id="PMInterLock" display="" schematicId="" unit="" doLidOpenRoutineSucceed="DO_PurgeRoutineSucceed"
<IoInterLock id="PMInterLock" display="" schematicId="" unit="" doLidOpenRoutineSucceed="DO_PurgeRoutineSuscessed"
doLidCloseRoutineSucceed="DO_CleanRoutineSuscessed" doProcessRunning="DO_ProcessRunning" doPreprocessRunning="DO_PreprocessRunning"
doCyclePurgeRoutineRunning="DO_CyclePurgeRoutineRunning" doExchangeMoRoutineRunning="DO_ExchangeMoRoutineRunning"
doLidCloseRoutineRunning="DO_CleanRoutineRunning" doLidOpenRoutineRunning="DO_PurgeRoutineRunning"

2
App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
View File

@ -302,7 +302,7 @@
</IoHeartBeats>
<IoInterLocks classType="Aitex.Core.RT.Device.Devices.IoInterLock" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoInterLock id="PMInterLock" display="" schematicId="" unit="" doLidOpenRoutineSucceed="DO_PurgeRoutineSucceed"
<IoInterLock id="PMInterLock" display="" schematicId="" unit="" doLidOpenRoutineSucceed="DO_PurgeRoutineSuscessed"
doLidCloseRoutineSucceed="DO_CleanRoutineSuscessed" doProcessRunning="DO_ProcessRunning" doPreprocessRunning="DO_PreprocessRunning"
doCyclePurgeRoutineRunning="DO_CyclePurgeRoutineRunning" doExchangeMoRoutineRunning="DO_ExchangeMoRoutineRunning"
doLidCloseRoutineRunning="DO_CleanRoutineRunning" doLidOpenRoutineRunning="DO_PurgeRoutineRunning"

2
App/Modules/SicModules/Config/TM/DeviceModelSystem.xml
View File

@ -133,7 +133,7 @@
</TMRobots>
<IoHeartBeats classType="Aitex.Core.RT.Device.Devices.IoHeartBeat" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoHeartBeat id="HeartBeat" display="HeartBeat" schematicId="HeartBeat" aioType="float" ai="AI_HeartBeat" ao="AO_HeartBeat" />
<IoHeartBeat id="HeartBeat" module="TM" display="HeartBeat" schematicId="HeartBeat" aioType="float" ai="AI_HeartBeat" ao="AO_HeartBeat" />
</IoHeartBeats>

8
App/Modules/SicModules/Config/TM/IODefinePlatform.xml
View File

@ -224,8 +224,12 @@
<DO_ITEM Index="34" Name="DO_BufferStationDoorOpen" BufferOffset="34" Addr="34" Description="" Visible="false"/>
<DO_ITEM Index="35" Name="DO_GloveBoxLoadwafer" BufferOffset="35" Addr="35" Description="" />
<DO_ITEM Index="36" Name="DO_GloveBoxUnLoadwafer" BufferOffset="36" Addr="36" Description="" />
<DO_ITEM Index="37" Name="DO_GloveBoxSpare01" BufferOffset="37" Addr="37" Description="" />
<DO_ITEM Index="38" Name="DO_GloveBoxSpare02" BufferOffset="38" Addr="38" Description="" />
<DO_ITEM Index="39" Name="DO_GloveBoxSpare03" BufferOffset="39" Addr="39" Description="" />
<DO_ITEM Index="40" Name="DO_GloveBoxSpare04" BufferOffset="40" Addr="40" Description="" />
<DO_ITEM Index="41" Name="DO_GloveBoxSpare05" BufferOffset="41" Addr="41" Description="" />
<DO_ITEM Index="42" Name="DO_GloveBoxSpare06" BufferOffset="42" Addr="42" Description="" />
<DO_ITEM Index="43" Name="DO_UnloadStationWaferCYClamp" BufferOffset="43" Addr="43" Description="" Visible="false"/>
<DO_ITEM Index="44" Name="DO_UnloadStationWaferCYOpen" BufferOffset="44" Addr="44" Description="" Visible="false"/>
<DO_ITEM Index="45" Name="DO_UnloadStationLifterCYUp" BufferOffset="45" Addr="45" Description="" Visible="false"/>

2
App/Modules/SicModules/PMs/Routines/PMChamberMoveBodyRoutine.cs
View File

@ -126,7 +126,7 @@ namespace SicModules.PMs.Routines
}
if (_pm1Module._pmInterLock != null && !_pm1Module._pmInterLock.DoLidOpenRoutineSucceed && _Open) // 不限制close do-172
{
EV.PostWarningLog(Module, "DO-172 DO_PurgeRoutineSucceed must be on!");
EV.PostWarningLog(Module, "DO-172 DO_PurgeRoutineSuscessed must be on!");
return Result.FAIL;
}
if (PmDevice.PSU2.AllHeatEnable)

2
App/SicRT/Properties/AssemblyInfo.cs
View File

@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
[assembly: AssemblyVersion("1.1.0.60812")]
[assembly: AssemblyVersion("1.1.0.60814")]
[assembly: AssemblyInformationalVersion("MoS2（无EFEM）")]

9
App/SicSimulator/Config/IODefinePlatform.xml
View File

@ -224,8 +224,12 @@
<DO_ITEM Index="34" Name="DO_BufferStationDoorOpen" BufferOffset="34" Addr="34" Description="" Visible="false"/>
<DO_ITEM Index="35" Name="DO_GloveBoxLoadwafer" BufferOffset="35" Addr="35" Description="" />
<DO_ITEM Index="36" Name="DO_GloveBoxUnLoadwafer" BufferOffset="36" Addr="36" Description="" />
<DO_ITEM Index="37" Name="DO_GloveBoxSpare01" BufferOffset="37" Addr="37" Description="" />
<DO_ITEM Index="38" Name="DO_GloveBoxSpare02" BufferOffset="38" Addr="38" Description="" />
<DO_ITEM Index="39" Name="DO_GloveBoxSpare03" BufferOffset="39" Addr="39" Description="" />
<DO_ITEM Index="40" Name="DO_GloveBoxSpare04" BufferOffset="40" Addr="40" Description="" />
<DO_ITEM Index="41" Name="DO_GloveBoxSpare05" BufferOffset="41" Addr="41" Description="" />
<DO_ITEM Index="42" Name="DO_GloveBoxSpare06" BufferOffset="42" Addr="42" Description="" />
<DO_ITEM Index="43" Name="DO_UnloadStationWaferCYClamp" BufferOffset="43" Addr="43" Description="" Visible="false"/>
<DO_ITEM Index="44" Name="DO_UnloadStationWaferCYOpen" BufferOffset="44" Addr="44" Description="" Visible="false"/>
<DO_ITEM Index="45" Name="DO_UnloadStationLifterCYUp" BufferOffset="45" Addr="45" Description="" Visible="false"/>
@ -310,7 +314,6 @@
<AI_ITEM Index="6" Name="AI_LoadLockTemp" BufferOffset="6" Addr="6" Description="" />
<AI_ITEM Index="7" Name="AI_BufferTemp" BufferOffset="7" Addr="7" Description="" />
<AI_ITEM Index="8" Name="AI_M60FlowRead" BufferOffset="8" Addr="8" Description="" />
<AI_ITEM Index="13" Name="AI_LdRotationRelativeDegree" BufferOffset="13" Addr="13" Description="" />
<AI_ITEM Index="14" Name="AI_LdRotationCCD1Degree" BufferOffset="14" Addr="14" Description="" />
<AI_ITEM Index="15" Name="AI_LdRotationCCD2Degree" BufferOffset="15" Addr="15" Description="" />

31
App/SicUI/Models/PMs/PMMotionViewModel.cs
View File

@ -566,21 +566,26 @@ namespace SicUI.Models.PMs
public Visibility HeatEnableTips { get; set; }
private bool CheckHeatConditionOK(out double minuts)
{
//minuts = 0;
//int lidopenAfterHeatDisbaleMinuts = (int)QueryDataClient.Instance.Service.GetConfig("PM.LidEnableOpenAfterHeatDisbaleTime");
//string dateTimeStr = QueryDataClient.Instance.Service.GetConfig($"PM.{SystemName}.OpenLidCountDownTime").ToString();
//DateTime dtStartTime =DateTime.Now;
//if (DateTime.TryParse(dateTimeStr, out dtStartTime))
//{
// minuts = lidopenAfterHeatDisbaleMinuts - (DateTime.Now - dtStartTime).TotalMinutes;
// if (dtStartTime.AddMinutes(lidopenAfterHeatDisbaleMinuts) < DateTime.Now)
// {
// HeatEnableTips = Visibility.Collapsed;
// return true;
// }
//}
//HeatEnableTips = Visibility.Visible;
//return false;
minuts = 0;
int lidopenAfterHeatDisbaleMinuts = (int)QueryDataClient.Instance.Service.GetConfig("PM.LidEnableOpenAfterHeatDisbaleTime");
string dateTimeStr = QueryDataClient.Instance.Service.GetConfig($"PM.{SystemName}.OpenLidCountDownTime").ToString();
DateTime dtStartTime =DateTime.Now;
if (DateTime.TryParse(dateTimeStr, out dtStartTime))
{
minuts = lidopenAfterHeatDisbaleMinuts - (DateTime.Now - dtStartTime).TotalMinutes;
if (dtStartTime.AddMinutes(lidopenAfterHeatDisbaleMinuts) < DateTime.Now)
{
HeatEnableTips = Visibility.Collapsed;
return true;
}
}
HeatEnableTips = Visibility.Visible;
return false;
}
}
}

2
App/SicUI/Properties/AssemblyInfo.cs
View File

@ -55,6 +55,6 @@ using System.Windows;
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.1.0.60812")]
[assembly: AssemblyVersion("1.1.0.60814")]
[assembly: AssemblyInformationalVersion("MoS2（无EFEM）")]

6
Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoInterLock.cs
View File

@ -376,20 +376,20 @@ namespace Aitex.Core.RT.Device.Devices
//{
// if (_aiTempCtrl1.Value > 100)
// {
// EV.PostWarningLog(Module, $"Can not set [DO-172]DO_PurgeRoutineSucceed to {eValue}，Reason：Interlock triggered, AI-193({Module}.AI_PSUTC) > 100");
// EV.PostWarningLog(Module, $"Can not set [DO-172]DO_PurgeRoutineSuscessed to {eValue}，Reason：Interlock triggered, AI-193({Module}.AI_PSUTC) > 100");
// return false;
// }
//}
if (!_doLidOpenRoutineSucceed.Check(eValue, out reason))
{
EV.PostWarningLog(Module, $"Can not set [DO-172]DO_PurgeRoutineSucceed to {eValue}，Reason：" + reason);
EV.PostWarningLog(Module, $"Can not set [DO-172]DO_PurgeRoutineSuscessed to {eValue}，Reason：" + reason);
return false;
}
//if (!_doPreprocessRunning.SetValue(eValue, out reason))
if (!_doLidOpenRoutineSucceed.SetValue(eValue, out reason))
{
EV.PostWarningLog(Module, $"Can not set [DO-172]DO_PurgeRoutineSucceed to {eValue}，Reason：" + reason);
EV.PostWarningLog(Module, $"Can not set [DO-172]DO_PurgeRoutineSuscessed to {eValue}，Reason：" + reason);
return false;
}