diff --git a/Modules/SicModules/Config/TM/DeviceModelSystem.xml b/Modules/SicModules/Config/TM/DeviceModelSystem.xml index 06b6b43..732d4df 100644 --- a/Modules/SicModules/Config/TM/DeviceModelSystem.xml +++ b/Modules/SicModules/Config/TM/DeviceModelSystem.xml @@ -111,7 +111,6 @@ - @@ -129,7 +128,7 @@ - + diff --git a/Modules/SicModules/Config/TM/IODefinePlatform.xml b/Modules/SicModules/Config/TM/IODefinePlatform.xml index 0f58c5e..bb4bd70 100644 --- a/Modules/SicModules/Config/TM/IODefinePlatform.xml +++ b/Modules/SicModules/Config/TM/IODefinePlatform.xml @@ -44,6 +44,8 @@ + + @@ -170,8 +172,8 @@ - - + + diff --git a/Modules/SicModules/TMs/SicTM.cs b/Modules/SicModules/TMs/SicTM.cs index 9fd842d..d108941 100644 --- a/Modules/SicModules/TMs/SicTM.cs +++ b/Modules/SicModules/TMs/SicTM.cs @@ -138,7 +138,7 @@ namespace SicModules.TMs { _slitValves[ModuleName.PM1] = DEVICE.GetDevice("TM.PM1Door"); _slitValves[ModuleName.PM2] = DEVICE.GetDevice("TM.PM2Door"); - _slitValves[ModuleName.UnLoad] = DEVICE.GetDevice("TM.UnLoadDoor"); + //_slitValves[ModuleName.UnLoad] = DEVICE.GetDevice("TM.UnLoadDoor"); _slitValves[ModuleName.LoadLock] = DEVICE.GetDevice("TM.LoadLockDoor"); _slitValves[ModuleName.Buffer] = DEVICE.GetDevice("TM.BufferDoor"); diff --git a/SicSimulator/Config/IODefinePlatform.xml b/SicSimulator/Config/IODefinePlatform.xml index d5caaf6..0382502 100644 --- a/SicSimulator/Config/IODefinePlatform.xml +++ b/SicSimulator/Config/IODefinePlatform.xml @@ -44,7 +44,9 @@ - + + + @@ -170,8 +172,8 @@ - - + + diff --git a/SicSimulator/Instances/SimulatorSystem.cs b/SicSimulator/Instances/SimulatorSystem.cs index ec640b9..3212e0c 100644 --- a/SicSimulator/Instances/SimulatorSystem.cs +++ b/SicSimulator/Instances/SimulatorSystem.cs @@ -38,6 +38,8 @@ namespace SicSimulator.Instances private void SetTMDefaultValue(string mod) { + IO.DO["DO_LoadLidClose"].Value = true; + IO.DI["DI_LoadLidLocked"].Value = true; IO.DI["DI_UnloadStationLifterCYDown"].Value = true; IO.DI["DI_LoadWafeCYOpened"].Value = true; @@ -104,6 +106,7 @@ namespace SicSimulator.Instances IO.DO["DO_LoadLidLock"].Value = true; IO.DO["DO_LoadLidUnlock"].Value = true; + } private void SetDefaultValue(string mod) @@ -788,12 +791,6 @@ namespace SicSimulator.Instances IO.DI["DI_ReactorBDoorClosed"].Value = IO.DO["DO_RectorBDoorClose"].Value; } - if (IO.DO["DO_UnloadStationDoorOpen"].Value != IO.DO["DO_UnloadStationDoorClose"].Value) - { - IO.DI["DI_UnloadStationDoorOpened"].Value = IO.DO["DO_UnloadStationDoorOpen"].Value; - IO.DI["DI_UnloadStationDoorClosed"].Value = IO.DO["DO_UnloadStationDoorClose"].Value; - } - if (IO.DO["DO_BufferStationDoorOpen"].Value != IO.DO["DO_BufferStationDoorClose"].Value) { IO.DI["DI_BufferStationDoorOpened"].Value = IO.DO["DO_BufferStationDoorOpen"].Value; @@ -828,6 +825,10 @@ namespace SicSimulator.Instances private void MonitorTMValve() { + + //DI_LoadLidClose + IO.DI["DI_LoadLidClose"].Value = IO.DO["DO_LoadLidClose"].Value; + IO.DI["DI_LoadLidOpen"].Value = IO.DO["DO_LoadLidOpen"].Value; IO.DI["DI_VacRobotExtendBufferEnableFB"].Value = IO.DO["DO_VacRobotExtendBufferEnable"].Value; IO.DI["DI_VacRobotExtenLoadEnableFB"].Value = IO.DO["DO_VacRobotExtenLoadEnable"].Value; IO.DI["DI_VacRobotExtendPMAEnableFB"].Value = IO.DO["DO_VacRobotExtendPMAEnable"].Value; diff --git a/SicUI/Controls/Mainframe/M2C4EFEMView3.xaml b/SicUI/Controls/Mainframe/M2C4EFEMView3.xaml index 369dec8..35a6d66 100644 --- a/SicUI/Controls/Mainframe/M2C4EFEMView3.xaml +++ b/SicUI/Controls/Mainframe/M2C4EFEMView3.xaml @@ -177,10 +177,10 @@ HasWafer="{Binding IsArmWater}" IsEnabled="{Binding TMEnableWaferClick}" RobotMoveInfo="{Binding TmRobotMoveInfo}" - Wafer1="{Binding TMRobotWafer1}" RotateAngle="123" ShowDock="False" - TranslateX="120" /> + TranslateX="120" + Wafer1="{Binding TMRobotWafer1}" /> BufferDoorState == FoupDoorState.Open ? true : false; public bool IsBufferDoorOpen => true; - public bool IsUnLoadDoorOpen => UnLoadDoorState == FoupDoorState.Open ? true : false; + public bool IsUnLoadDoorOpen => true ; public bool IsPM1DoorOpen => PM1DoorState == FoupDoorState.Open ? true : false; public bool IsPM2DoorOpen => PM2DoorState == FoupDoorState.Open ? true : false; @@ -1116,12 +1105,12 @@ namespace SicUI.Client.Models.Platform.TM public void LoadLidLock() { - InvokeClient.Instance.Service.DoOperation($"LoadLock.LoadLidLock.MoveUp"); + InvokeClient.Instance.Service.DoOperation($"LoadLock.LoadLidLock.MoveDown"); } public void LoadLidUnlock() { - InvokeClient.Instance.Service.DoOperation($"LoadLock.LoadLidLock.MoveDown"); + InvokeClient.Instance.Service.DoOperation($"LoadLock.LoadLidLock.MoveUp"); }