From 5da921c88ecfd3e58502111fc35c4c1326614f01 Mon Sep 17 00:00:00 2001 From: "DESKTOP-GPE37UV\\THINKAPD" Date: Thu, 13 Apr 2023 15:35:13 +0800 Subject: [PATCH] =?UTF-8?q?Mainframe=E5=B7=A5=E7=A8=8B=E6=9B=B4=E5=90=8D?= =?UTF-8?q?=E4=B8=BASicModules=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Modules/Mainframe/Aligners/AlignerModule.cs | 12 +- .../Mainframe/Aligners/AlignerModuleBase.cs | 3 +- .../{ => Routines}/AlignerAlignRoutine.cs | 8 +- .../{ => Routines}/AlignerHomeRoutine.cs | 6 +- .../{ => Routines/Base}/AlignerBaseRoutine.cs | 6 +- Modules/Mainframe/Aligners/SicAligner.cs | 6 +- Modules/Mainframe/Buffers/BufferModule.cs | 14 +- Modules/Mainframe/Buffers/BufferModuleBase.cs | 7 +- .../{ => Routines}/BufferCoolingRoutine.cs | 5 +- .../{ => Routines}/BufferHomeRoutine.cs | 4 +- Modules/Mainframe/Buffers/SicBuffer.cs | 13 +- Modules/Mainframe/Cassettes/CassetteModule.cs | 6 +- .../Mainframe/Cassettes/CassetteModuleBase.cs | 2 +- Modules/Mainframe/Cassettes/SicCassette.cs | 5 +- .../Mainframe/Config/TM/DeviceModelSystem.xml | 28 +-- Modules/Mainframe/Devices/IoInterLock.cs | 13 +- Modules/Mainframe/Devices/IoLoadRotation.cs | 8 +- Modules/Mainframe/Devices/IoPump.cs | 16 +- Modules/Mainframe/Devices/SicAds.cs | 3 +- .../Mainframe/Devices/SiemensIoProvider.cs | 10 +- Modules/Mainframe/Devices/TcAds.cs | 4 +- Modules/Mainframe/EFEMs/EFEMModule.cs | 9 +- Modules/Mainframe/EFEMs/EFEMModuleBase.cs | 3 +- .../{ => Routines/Base}/EfemBaseRoutine.cs | 12 +- .../EFEMs/{ => Routines}/EFEMHomeRoutine.cs | 5 +- .../{ => Routines}/EfemSlitValveRoutine.cs | 15 +- .../{ => Routines}/TrayRobotHomeRoutine.cs | 4 +- .../{ => Routines}/TrayRobotMapRoutine.cs | 4 +- .../{ => Routines}/TrayRobotPickRoutine.cs | 5 +- .../{ => Routines}/TrayRobotPlaceRoutine.cs | 8 +- .../{ => Routines}/WaferRobotHomeRoutine.cs | 4 +- .../{ => Routines}/WaferRobotMapRoutine.cs | 4 +- .../{ => Routines}/WaferRobotPickRoutine.cs | 8 +- .../{ => Routines}/WaferRobotPlaceRoutine.cs | 13 +- Modules/Mainframe/EFEMs/SicEFEM.cs | 7 +- Modules/Mainframe/EFEMs/SicTrayRobot.cs | 11 +- Modules/Mainframe/EFEMs/SicWaferRobot.cs | 11 +- Modules/Mainframe/EFEMs/TrayRobotModule.cs | 10 +- Modules/Mainframe/EFEMs/WaferRobotModule.cs | 10 +- Modules/Mainframe/LLs/LoadLockModule.cs | 16 +- Modules/Mainframe/LLs/LoadLockModuleBase.cs | 2 +- .../Base}/LoadLockBaseRoutine.cs | 38 +-- .../LLs/{ => Routines}/LoadHomeRoutine.cs | 7 +- .../LLs/{ => Routines}/LoadLockClawRoutine.cs | 7 +- .../{ => Routines}/LoadLockGroupRoutine.cs | 8 +- .../LoadLockLeakCheckRoutine.cs | 8 +- .../LLs/{ => Routines}/LoadLockLiftRoutine.cs | 7 +- .../LoadLockPrepareTransferRoutine.cs | 6 +- .../LLs/{ => Routines}/LoadLockPumpRoutine.cs | 12 +- .../{ => Routines}/LoadLockPurgeRoutine.cs | 13 +- .../{ => Routines}/LoadLockServoToRoutine.cs | 11 +- .../LoadLockTrayAlignerRoutine.cs | 8 +- .../{ => Routines}/LoadLockTrayClawRoutine.cs | 9 +- .../LLs/{ => Routines}/LoadLockVentRoutine.cs | 11 +- .../LoadRotationHomeOffsetRoutine.cs | 9 +- .../LLs/{ => Routines}/LoadSeparateRoutine.cs | 11 +- Modules/Mainframe/LLs/SicLoadLock.cs | 13 +- Modules/Mainframe/PMs/PM1.cs | 8 +- Modules/Mainframe/PMs/PM2.cs | 8 +- .../Mainframe/PMs/{Support => }/PMModule.cs | 11 +- .../PMs/{Support => }/PMModuleDevice.cs | 29 +-- .../PMs/{Support => }/PMModuleInterlock.cs | 18 +- .../RecipeExecutions/CleanRecipe.cs | 13 +- .../PMs/{Support => }/RecipeExecutions/Fdc.cs | 4 +- .../RecipeExecutions/IRecipeDBCallback.cs | 8 +- .../RecipeExecutions/IRecipeExecutor.cs | 8 +- .../RecipeExecutions/PostProcess.cs | 8 +- .../RecipeExecutions/PreProcess.cs | 7 +- .../{Support => }/RecipeExecutions/Process.cs | 12 +- .../RecipeExecutions/ProcessCalculate.cs | 10 +- .../RecipeExecutions/RecipeDBCallback.cs | 8 +- .../RecipeExecutions/RecipeEndDataItem.cs | 6 +- .../RecipeExecutions/RecipeHead.cs | 2 +- .../RecipeExecutions/RecipeParser.cs | 3 +- .../RecipeExecutions/RecipeRunningInfo.cs | 3 +- .../RecipeExecutions/RecipeStep.cs | 2 +- .../RecipeExecutions/SicRecipeFileContext.cs | 16 +- .../Base}/PMBaseRoutine.cs | 3 +- .../Routines/PMButttomSectionMoveRoutine.cs | 9 +- .../Routines/PMChamberMoveBodyRoutine.cs | 7 +- .../{Support => }/Routines/PMCleanRoutine.cs | 13 +- .../Routines/PMExchangeMoRoutine.cs | 12 +- .../{Support => }/Routines/PMHomeRoutine.cs | 4 +- .../Routines/PMLeakCheckRoutine.cs | 12 +- .../Routines/PMPcCalibrationRoutine.cs | 10 +- .../Routines/PMPostTransferRoutine.cs | 13 +- .../Routines/PMPrepareTransferRoutine.cs | 16 +- .../Routines/PMProcessAbortRoutine.cs | 11 +- .../Routines/PMProcessRoutine.cs | 2 +- .../{Support => }/Routines/PMPumpRoutine.cs | 10 +- .../{Support => }/Routines/PMPurgeRoutine.cs | 11 +- .../Routines/PMServoToPressure.cs | 9 +- .../Routines/PMStopHeatEnableRoutine.cs | 8 +- .../Routines/PMToAtmIdleRoutine.cs | 11 +- .../Routines/PMToIsolationRoutine.cs | 10 +- .../Routines/PMToProcessIdleRoutine.cs | 10 +- .../Routines/PMVacIdleRoutine.cs | 10 +- .../{Support => }/Routines/PMVentRoutine.cs | 10 +- .../Recipe}/PMMacroRoutine.cs | 7 +- .../Recipe}/PostPMMacroRoutine.cs | 14 +- .../Recipe}/PrePMMacroRoutine.cs | 15 +- .../Recipe}/RecipeParser.cs | 14 +- .../{Support => }/Utilities/UnitAlarmItem.cs | 8 +- .../PMs/{Support => }/Utilities/XmlConfig.cs | 11 +- .../{Mainframe.csproj => SicModules.csproj} | 222 +++++++++--------- .../TMs/{ => Routines/Base}/TMBaseRoutine.cs | 8 +- .../TMs/{ => Routines}/TMHomeRoutine.cs | 8 +- .../TMs/{ => Routines}/TMLeakcheckRoutine.cs | 12 +- .../TMPressureBalancePidRoutine.cs | 16 +- .../TMPressureBalanceRoutine.cs | 4 +- .../TMs/{ => Routines}/TMPumpRoutine.cs | 16 +- .../TMs/{ => Routines}/TMPurgeRoutine.cs | 15 +- .../{ => Routines}/TMRobotExtendRoutine.cs | 9 +- .../TMs/{ => Routines}/TMRobotGoToRoutine.cs | 14 +- .../TMs/{ => Routines}/TMRobotHomeRoutine.cs | 8 +- .../TMRobotPickAndPlaceRoutine.cs | 11 +- .../TMs/{ => Routines}/TMRobotPickRoutine.cs | 12 +- .../TMs/{ => Routines}/TMRobotPlaceRoutine.cs | 7 +- .../{ => Routines}/TMRobotRetractRoutine.cs | 8 +- .../TMs/{ => Routines}/TMServoRoutine.cs | 10 +- .../TMs/{ => Routines}/TMSlitValveRoutine.cs | 11 +- .../TMs/{ => Routines}/TMVentRoutine.cs | 16 +- .../TMVerifySlitValveRoutine.cs | 2 +- Modules/Mainframe/TMs/SicTM.cs | 21 +- Modules/Mainframe/TMs/SicTMRobot.cs | 6 +- Modules/Mainframe/TMs/TMModule.cs | 24 +- Modules/Mainframe/TMs/TMModuleBase.cs | 2 +- .../{ => Routines/Base}/UnLoadBaseRoutine.cs | 13 +- .../{ => Routines}/UnLoadClawRoutine.cs | 11 +- .../UnLoadCoolingAndPurgeRoutine.cs | 12 +- .../{ => Routines}/UnLoadCoolingRoutine.cs | 10 +- .../{ => Routines}/UnLoadHomeRoutine.cs | 11 +- .../{ => Routines}/UnLoadLeakCheckRoutine.cs | 9 +- .../{ => Routines}/UnLoadLiftRoutine.cs | 10 +- .../UnLoadPrepareTransferRoutine.cs | 6 +- .../{ => Routines}/UnLoadPumpRoutine.cs | 7 +- .../{ => Routines}/UnLoadPurgeRoutine.cs | 8 +- .../{ => Routines}/UnLoadSeparateRoutine.cs | 7 +- .../{ => Routines}/UnLoadServoToRoutine.cs | 8 +- .../{ => Routines}/UnLoadVentRoutine.cs | 7 +- Modules/Mainframe/UnLoads/SicUnLoad.cs | 16 +- Modules/Mainframe/UnLoads/UnLoadModule.cs | 12 +- Modules/Mainframe/UnLoads/UnLoadModuleBase.cs | 2 +- Sic08.sln | 9 +- SicRT/Config/IoProviderConfig.xml | 2 +- SicRT/Equipments/HomeAll.cs | 16 +- SicRT/Equipments/ManualTransfer.cs | 4 +- .../Equipments/Schedulers/SchedulerAligner.cs | 3 +- .../Equipments/Schedulers/SchedulerBuffer.cs | 2 +- .../Schedulers/SchedulerCassette.cs | 2 +- .../Schedulers/SchedulerLoadLock.cs | 2 +- .../Equipments/Schedulers/SchedulerTMRobot.cs | 2 +- .../Schedulers/SchedulerTrayRobot.cs | 2 +- .../Equipments/Schedulers/SchedulerUnLoad.cs | 4 +- .../Schedulers/SchedulerWaferRobot.cs | 2 +- SicRT/Equipments/Systems/DeviceManager.cs | 4 - SicRT/Equipments/Systems/EquipmentManager.cs | 21 +- SicRT/Instances/ToolLoader.cs | 2 +- SicRT/SicRT.csproj | 12 +- .../{Sic_Setup.csproj => SicSetup.csproj} | 4 +- 160 files changed, 670 insertions(+), 1006 deletions(-) rename Modules/Mainframe/Aligners/{ => Routines}/AlignerAlignRoutine.cs (93%) rename Modules/Mainframe/Aligners/{ => Routines}/AlignerHomeRoutine.cs (93%) rename Modules/Mainframe/Aligners/{ => Routines/Base}/AlignerBaseRoutine.cs (98%) rename Modules/Mainframe/Buffers/{ => Routines}/BufferCoolingRoutine.cs (96%) rename Modules/Mainframe/Buffers/{ => Routines}/BufferHomeRoutine.cs (94%) rename Modules/Mainframe/EFEMs/{ => Routines/Base}/EfemBaseRoutine.cs (99%) rename Modules/Mainframe/EFEMs/{ => Routines}/EFEMHomeRoutine.cs (94%) rename Modules/Mainframe/EFEMs/{ => Routines}/EfemSlitValveRoutine.cs (97%) rename Modules/Mainframe/EFEMs/{ => Routines}/TrayRobotHomeRoutine.cs (94%) rename Modules/Mainframe/EFEMs/{ => Routines}/TrayRobotMapRoutine.cs (96%) rename Modules/Mainframe/EFEMs/{ => Routines}/TrayRobotPickRoutine.cs (98%) rename Modules/Mainframe/EFEMs/{ => Routines}/TrayRobotPlaceRoutine.cs (98%) rename Modules/Mainframe/EFEMs/{ => Routines}/WaferRobotHomeRoutine.cs (94%) rename Modules/Mainframe/EFEMs/{ => Routines}/WaferRobotMapRoutine.cs (97%) rename Modules/Mainframe/EFEMs/{ => Routines}/WaferRobotPickRoutine.cs (98%) rename Modules/Mainframe/EFEMs/{ => Routines}/WaferRobotPlaceRoutine.cs (96%) rename Modules/Mainframe/LLs/{ => Routines/Base}/LoadLockBaseRoutine.cs (97%) rename Modules/Mainframe/LLs/{ => Routines}/LoadHomeRoutine.cs (96%) rename Modules/Mainframe/LLs/{ => Routines}/LoadLockClawRoutine.cs (94%) rename Modules/Mainframe/LLs/{ => Routines}/LoadLockGroupRoutine.cs (97%) rename Modules/Mainframe/LLs/{ => Routines}/LoadLockLeakCheckRoutine.cs (98%) rename Modules/Mainframe/LLs/{ => Routines}/LoadLockLiftRoutine.cs (91%) rename Modules/Mainframe/LLs/{ => Routines}/LoadLockPrepareTransferRoutine.cs (98%) rename Modules/Mainframe/LLs/{ => Routines}/LoadLockPumpRoutine.cs (96%) rename Modules/Mainframe/LLs/{ => Routines}/LoadLockPurgeRoutine.cs (94%) rename Modules/Mainframe/LLs/{ => Routines}/LoadLockServoToRoutine.cs (93%) rename Modules/Mainframe/LLs/{ => Routines}/LoadLockTrayAlignerRoutine.cs (61%) rename Modules/Mainframe/LLs/{ => Routines}/LoadLockTrayClawRoutine.cs (90%) rename Modules/Mainframe/LLs/{ => Routines}/LoadLockVentRoutine.cs (95%) rename Modules/Mainframe/LLs/{ => Routines}/LoadRotationHomeOffsetRoutine.cs (92%) rename Modules/Mainframe/LLs/{ => Routines}/LoadSeparateRoutine.cs (91%) rename Modules/Mainframe/PMs/{Support => }/PMModule.cs (99%) rename Modules/Mainframe/PMs/{Support => }/PMModuleDevice.cs (99%) rename Modules/Mainframe/PMs/{Support => }/PMModuleInterlock.cs (64%) rename Modules/Mainframe/PMs/{Support => }/RecipeExecutions/CleanRecipe.cs (98%) rename Modules/Mainframe/PMs/{Support => }/RecipeExecutions/Fdc.cs (98%) rename Modules/Mainframe/PMs/{Support => }/RecipeExecutions/IRecipeDBCallback.cs (74%) rename Modules/Mainframe/PMs/{Support => }/RecipeExecutions/IRecipeExecutor.cs (79%) rename Modules/Mainframe/PMs/{Support => }/RecipeExecutions/PostProcess.cs (98%) rename Modules/Mainframe/PMs/{Support => }/RecipeExecutions/PreProcess.cs (99%) rename Modules/Mainframe/PMs/{Support => }/RecipeExecutions/Process.cs (99%) rename Modules/Mainframe/PMs/{Support => }/RecipeExecutions/ProcessCalculate.cs (98%) rename Modules/Mainframe/PMs/{Support => }/RecipeExecutions/RecipeDBCallback.cs (90%) rename Modules/Mainframe/PMs/{Support => }/RecipeExecutions/RecipeEndDataItem.cs (92%) rename Modules/Mainframe/PMs/{Support => }/RecipeExecutions/RecipeHead.cs (81%) rename Modules/Mainframe/PMs/{Support => }/RecipeExecutions/RecipeParser.cs (99%) rename Modules/Mainframe/PMs/{Support => }/RecipeExecutions/RecipeRunningInfo.cs (96%) rename Modules/Mainframe/PMs/{Support => }/RecipeExecutions/RecipeStep.cs (94%) rename Modules/Mainframe/PMs/{Support => }/RecipeExecutions/SicRecipeFileContext.cs (96%) rename Modules/Mainframe/PMs/{Support/Routines => Routines/Base}/PMBaseRoutine.cs (99%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMButttomSectionMoveRoutine.cs (97%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMChamberMoveBodyRoutine.cs (99%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMCleanRoutine.cs (98%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMExchangeMoRoutine.cs (98%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMHomeRoutine.cs (97%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMLeakCheckRoutine.cs (99%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMPcCalibrationRoutine.cs (98%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMPostTransferRoutine.cs (97%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMPrepareTransferRoutine.cs (98%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMProcessAbortRoutine.cs (98%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMProcessRoutine.cs (99%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMPumpRoutine.cs (98%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMPurgeRoutine.cs (99%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMServoToPressure.cs (97%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMStopHeatEnableRoutine.cs (89%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMToAtmIdleRoutine.cs (98%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMToIsolationRoutine.cs (97%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMToProcessIdleRoutine.cs (99%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMVacIdleRoutine.cs (98%) rename Modules/Mainframe/PMs/{Support => }/Routines/PMVentRoutine.cs (98%) rename Modules/Mainframe/PMs/{Support/RecipeRoutine => Routines/Recipe}/PMMacroRoutine.cs (99%) rename Modules/Mainframe/PMs/{Support/RecipeRoutine => Routines/Recipe}/PostPMMacroRoutine.cs (71%) rename Modules/Mainframe/PMs/{Support/RecipeRoutine => Routines/Recipe}/PrePMMacroRoutine.cs (97%) rename Modules/Mainframe/PMs/{Support/RecipeRoutine => Routines/Recipe}/RecipeParser.cs (98%) rename Modules/Mainframe/PMs/{Support => }/Utilities/UnitAlarmItem.cs (72%) rename Modules/Mainframe/PMs/{Support => }/Utilities/XmlConfig.cs (85%) rename Modules/Mainframe/{Mainframe.csproj => SicModules.csproj} (52%) rename Modules/Mainframe/TMs/{ => Routines/Base}/TMBaseRoutine.cs (99%) rename Modules/Mainframe/TMs/{ => Routines}/TMHomeRoutine.cs (91%) rename Modules/Mainframe/TMs/{ => Routines}/TMLeakcheckRoutine.cs (98%) rename Modules/Mainframe/TMs/{ => Routines}/TMPressureBalancePidRoutine.cs (99%) rename Modules/Mainframe/TMs/{ => Routines}/TMPressureBalanceRoutine.cs (99%) rename Modules/Mainframe/TMs/{ => Routines}/TMPumpRoutine.cs (96%) rename Modules/Mainframe/TMs/{ => Routines}/TMPurgeRoutine.cs (96%) rename Modules/Mainframe/TMs/{ => Routines}/TMRobotExtendRoutine.cs (93%) rename Modules/Mainframe/TMs/{ => Routines}/TMRobotGoToRoutine.cs (95%) rename Modules/Mainframe/TMs/{ => Routines}/TMRobotHomeRoutine.cs (96%) rename Modules/Mainframe/TMs/{ => Routines}/TMRobotPickAndPlaceRoutine.cs (94%) rename Modules/Mainframe/TMs/{ => Routines}/TMRobotPickRoutine.cs (97%) rename Modules/Mainframe/TMs/{ => Routines}/TMRobotPlaceRoutine.cs (99%) rename Modules/Mainframe/TMs/{ => Routines}/TMRobotRetractRoutine.cs (94%) rename Modules/Mainframe/TMs/{ => Routines}/TMServoRoutine.cs (93%) rename Modules/Mainframe/TMs/{ => Routines}/TMSlitValveRoutine.cs (99%) rename Modules/Mainframe/TMs/{ => Routines}/TMVentRoutine.cs (95%) rename Modules/Mainframe/TMs/{ => Routines}/TMVerifySlitValveRoutine.cs (99%) rename Modules/Mainframe/UnLoads/{ => Routines/Base}/UnLoadBaseRoutine.cs (98%) rename Modules/Mainframe/UnLoads/{ => Routines}/UnLoadClawRoutine.cs (87%) rename Modules/Mainframe/UnLoads/{ => Routines}/UnLoadCoolingAndPurgeRoutine.cs (97%) rename Modules/Mainframe/UnLoads/{ => Routines}/UnLoadCoolingRoutine.cs (88%) rename Modules/Mainframe/UnLoads/{ => Routines}/UnLoadHomeRoutine.cs (95%) rename Modules/Mainframe/UnLoads/{ => Routines}/UnLoadLeakCheckRoutine.cs (98%) rename Modules/Mainframe/UnLoads/{ => Routines}/UnLoadLiftRoutine.cs (85%) rename Modules/Mainframe/UnLoads/{ => Routines}/UnLoadPrepareTransferRoutine.cs (98%) rename Modules/Mainframe/UnLoads/{ => Routines}/UnLoadPumpRoutine.cs (97%) rename Modules/Mainframe/UnLoads/{ => Routines}/UnLoadPurgeRoutine.cs (97%) rename Modules/Mainframe/UnLoads/{ => Routines}/UnLoadSeparateRoutine.cs (93%) rename Modules/Mainframe/UnLoads/{ => Routines}/UnLoadServoToRoutine.cs (95%) rename Modules/Mainframe/UnLoads/{ => Routines}/UnLoadVentRoutine.cs (97%) rename SicSetup/Sic_Setup/{Sic_Setup.csproj => SicSetup.csproj} (99%) diff --git a/Modules/Mainframe/Aligners/AlignerModule.cs b/Modules/Mainframe/Aligners/AlignerModule.cs index 951935d..51cb4ad 100644 --- a/Modules/Mainframe/Aligners/AlignerModule.cs +++ b/Modules/Mainframe/Aligners/AlignerModule.cs @@ -1,20 +1,20 @@ -using Aitex.Core.RT.DataCenter; +using System; +using System.Threading; +using System.Threading.Tasks; +using Aitex.Core.RT.DataCenter; using Aitex.Core.RT.Device; using Aitex.Core.RT.Event; using Aitex.Core.RT.Fsm; using Aitex.Core.RT.OperationCenter; using Aitex.Core.RT.Routine; -using Aitex.Core.Util; using Aitex.Core.Utilities; using Aitex.Sorter.Common; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Schedulers; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Aligners.HwAligner; -using System; -using System.Threading; -using System.Threading.Tasks; +using SicModules.Aligners.Routines; -namespace Mainframe.Aligners +namespace SicModules.Aligners { public class AlignerModule : AlignerModuleBase { diff --git a/Modules/Mainframe/Aligners/AlignerModuleBase.cs b/Modules/Mainframe/Aligners/AlignerModuleBase.cs index ded3b3a..cb2e28a 100644 --- a/Modules/Mainframe/Aligners/AlignerModuleBase.cs +++ b/Modules/Mainframe/Aligners/AlignerModuleBase.cs @@ -5,9 +5,8 @@ using MECF.Framework.Common.Fsm; using MECF.Framework.Common.Schedulers; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.LogicUnits; -using System; -namespace Mainframe.Aligners +namespace SicModules.Aligners { public abstract class AlignerModuleBase : ModuleFsmDevice, ITransferTarget, IModuleDevice { diff --git a/Modules/Mainframe/Aligners/AlignerAlignRoutine.cs b/Modules/Mainframe/Aligners/Routines/AlignerAlignRoutine.cs similarity index 93% rename from Modules/Mainframe/Aligners/AlignerAlignRoutine.cs rename to Modules/Mainframe/Aligners/Routines/AlignerAlignRoutine.cs index 2cbfead..aedffc2 100644 --- a/Modules/Mainframe/Aligners/AlignerAlignRoutine.cs +++ b/Modules/Mainframe/Aligners/Routines/AlignerAlignRoutine.cs @@ -1,10 +1,10 @@ -using Aitex.Core.RT.Routine; +using System.Diagnostics; +using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using System; -using System.Diagnostics; +using SicModules.Aligners.Routines.Base; -namespace Mainframe.Aligners +namespace SicModules.Aligners.Routines { public class AlignerAlignRoutine :AlignerBaseRoutine { diff --git a/Modules/Mainframe/Aligners/AlignerHomeRoutine.cs b/Modules/Mainframe/Aligners/Routines/AlignerHomeRoutine.cs similarity index 93% rename from Modules/Mainframe/Aligners/AlignerHomeRoutine.cs rename to Modules/Mainframe/Aligners/Routines/AlignerHomeRoutine.cs index b4d158f..5543b2a 100644 --- a/Modules/Mainframe/Aligners/AlignerHomeRoutine.cs +++ b/Modules/Mainframe/Aligners/Routines/AlignerHomeRoutine.cs @@ -1,8 +1,8 @@ - -using Aitex.Core.RT.Routine; +using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; +using SicModules.Aligners.Routines.Base; -namespace Mainframe.Aligners +namespace SicModules.Aligners.Routines { public class AlignerHomeRoutine : AlignerBaseRoutine { diff --git a/Modules/Mainframe/Aligners/AlignerBaseRoutine.cs b/Modules/Mainframe/Aligners/Routines/Base/AlignerBaseRoutine.cs similarity index 98% rename from Modules/Mainframe/Aligners/AlignerBaseRoutine.cs rename to Modules/Mainframe/Aligners/Routines/Base/AlignerBaseRoutine.cs index 6f206f0..cd3de93 100644 --- a/Modules/Mainframe/Aligners/AlignerBaseRoutine.cs +++ b/Modules/Mainframe/Aligners/Routines/Base/AlignerBaseRoutine.cs @@ -1,11 +1,11 @@ -using Aitex.Core.RT.Device; +using System; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Routine; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Aligners.HwAligner; -using System; -namespace Mainframe.Aligners +namespace SicModules.Aligners.Routines.Base { public class AlignerBaseRoutine : ModuleRoutine, IRoutine { diff --git a/Modules/Mainframe/Aligners/SicAligner.cs b/Modules/Mainframe/Aligners/SicAligner.cs index 7eb18d8..4b6c6e2 100644 --- a/Modules/Mainframe/Aligners/SicAligner.cs +++ b/Modules/Mainframe/Aligners/SicAligner.cs @@ -1,8 +1,8 @@ -using MECF.Framework.Common.Equipment; +using System.Xml; +using MECF.Framework.Common.Equipment; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Aligner; -using System.Xml; -namespace Mainframe.Aligners +namespace SicModules.Aligners { public class SicAligner : Aligner { diff --git a/Modules/Mainframe/Buffers/BufferModule.cs b/Modules/Mainframe/Buffers/BufferModule.cs index 9ec83c6..b03430e 100644 --- a/Modules/Mainframe/Buffers/BufferModule.cs +++ b/Modules/Mainframe/Buffers/BufferModule.cs @@ -1,4 +1,7 @@ -using Aitex.Core.RT.DataCenter; +using System; +using System.Threading; +using System.Threading.Tasks; +using Aitex.Core.RT.DataCenter; using Aitex.Core.RT.Device; using Aitex.Core.RT.Event; using Aitex.Core.RT.Fsm; @@ -8,14 +11,9 @@ using Aitex.Core.Utilities; using Aitex.Sorter.Common; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Schedulers; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; +using SicModules.Buffers.Routines; -namespace Mainframe.Buffers +namespace SicModules.Buffers { public class BufferModule : BufferModuleBase { diff --git a/Modules/Mainframe/Buffers/BufferModuleBase.cs b/Modules/Mainframe/Buffers/BufferModuleBase.cs index f81212e..8bfc1af 100644 --- a/Modules/Mainframe/Buffers/BufferModuleBase.cs +++ b/Modules/Mainframe/Buffers/BufferModuleBase.cs @@ -5,13 +5,8 @@ using MECF.Framework.Common.Fsm; using MECF.Framework.Common.Schedulers; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.LogicUnits; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Mainframe.Buffers +namespace SicModules.Buffers { public abstract class BufferModuleBase : ModuleFsmDevice, ITransferTarget, IModuleDevice { diff --git a/Modules/Mainframe/Buffers/BufferCoolingRoutine.cs b/Modules/Mainframe/Buffers/Routines/BufferCoolingRoutine.cs similarity index 96% rename from Modules/Mainframe/Buffers/BufferCoolingRoutine.cs rename to Modules/Mainframe/Buffers/Routines/BufferCoolingRoutine.cs index 2f629af..740217c 100644 --- a/Modules/Mainframe/Buffers/BufferCoolingRoutine.cs +++ b/Modules/Mainframe/Buffers/Routines/BufferCoolingRoutine.cs @@ -3,12 +3,9 @@ using System.Diagnostics; using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; using Aitex.Core.RT.Routine; -using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Aligners; - -namespace Mainframe.Buffers +namespace SicModules.Buffers.Routines { public class BufferCoolingRoutine : ModuleRoutine, IRoutine { diff --git a/Modules/Mainframe/Buffers/BufferHomeRoutine.cs b/Modules/Mainframe/Buffers/Routines/BufferHomeRoutine.cs similarity index 94% rename from Modules/Mainframe/Buffers/BufferHomeRoutine.cs rename to Modules/Mainframe/Buffers/Routines/BufferHomeRoutine.cs index e4e4162..45fdc6d 100644 --- a/Modules/Mainframe/Buffers/BufferHomeRoutine.cs +++ b/Modules/Mainframe/Buffers/Routines/BufferHomeRoutine.cs @@ -1,11 +1,9 @@ using System; using Aitex.Core.RT.Device; using Aitex.Core.RT.Routine; -using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Aligners; -namespace Mainframe.Buffers +namespace SicModules.Buffers.Routines { class BufferHomeRoutine : ModuleRoutine, IRoutine { diff --git a/Modules/Mainframe/Buffers/SicBuffer.cs b/Modules/Mainframe/Buffers/SicBuffer.cs index 6d19a4a..4784fd7 100644 --- a/Modules/Mainframe/Buffers/SicBuffer.cs +++ b/Modules/Mainframe/Buffers/SicBuffer.cs @@ -1,20 +1,9 @@ using System.Xml; -using Aitex.Core.RT.DataCenter; -using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; -using Aitex.Core.RT.Event; -using Aitex.Core.RT.Fsm; -using Aitex.Core.RT.IOCore; -using Aitex.Core.RT.OperationCenter; -using Aitex.Core.RT.Routine; using MECF.Framework.Common.Equipment; -using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Buffers; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Efems.Rorzes; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadPorts; -namespace Mainframe.Buffers +namespace SicModules.Buffers { public class SicBuffer : Buffer { diff --git a/Modules/Mainframe/Cassettes/CassetteModule.cs b/Modules/Mainframe/Cassettes/CassetteModule.cs index 4e0b456..9e26e17 100644 --- a/Modules/Mainframe/Cassettes/CassetteModule.cs +++ b/Modules/Mainframe/Cassettes/CassetteModule.cs @@ -1,4 +1,5 @@ -using Aitex.Core.Common; +using System; +using Aitex.Core.Common; using Aitex.Core.RT.DataCenter; using Aitex.Core.RT.Device; using Aitex.Core.RT.Event; @@ -10,9 +11,8 @@ using Aitex.Sorter.Common; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Schedulers; using MECF.Framework.Common.SubstrateTrackings; -using System; -namespace Mainframe.Cassettes +namespace SicModules.Cassettes { public class CassetteModule : CassetteModuleBase { diff --git a/Modules/Mainframe/Cassettes/CassetteModuleBase.cs b/Modules/Mainframe/Cassettes/CassetteModuleBase.cs index 5ecad51..bf98cf1 100644 --- a/Modules/Mainframe/Cassettes/CassetteModuleBase.cs +++ b/Modules/Mainframe/Cassettes/CassetteModuleBase.cs @@ -6,7 +6,7 @@ using MECF.Framework.Common.Schedulers; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.LogicUnits; -namespace Mainframe.Cassettes +namespace SicModules.Cassettes { public abstract class CassetteModuleBase : ModuleFsmDevice, ITransferTarget, IModuleDevice { diff --git a/Modules/Mainframe/Cassettes/SicCassette.cs b/Modules/Mainframe/Cassettes/SicCassette.cs index 1bcaab1..46685f3 100644 --- a/Modules/Mainframe/Cassettes/SicCassette.cs +++ b/Modules/Mainframe/Cassettes/SicCassette.cs @@ -1,9 +1,8 @@ - +using System.Xml; using MECF.Framework.Common.Equipment; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Cassette; -using System.Xml; -namespace Mainframe.Cassettes +namespace SicModules.Cassettes { public class SicCassette : Cassette { diff --git a/Modules/Mainframe/Config/TM/DeviceModelSystem.xml b/Modules/Mainframe/Config/TM/DeviceModelSystem.xml index e97b29e..ed20368 100644 --- a/Modules/Mainframe/Config/TM/DeviceModelSystem.xml +++ b/Modules/Mainframe/Config/TM/DeviceModelSystem.xml @@ -1,6 +1,6 @@  - + - + @@ -104,7 +104,7 @@ - + @@ -159,29 +159,29 @@ - + - + - + - + - + - + - + - + - + - + - + diff --git a/Modules/Mainframe/Devices/IoInterLock.cs b/Modules/Mainframe/Devices/IoInterLock.cs index 18cc821..d98c214 100644 --- a/Modules/Mainframe/Devices/IoInterLock.cs +++ b/Modules/Mainframe/Devices/IoInterLock.cs @@ -1,16 +1,11 @@ -using Aitex.Core.RT.DataCenter; +using System; +using System.Xml; +using Aitex.Core.RT.DataCenter; using Aitex.Core.RT.Device; -using Aitex.Core.RT.Event; using Aitex.Core.RT.IOCore; using Aitex.Core.RT.SCCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml; -namespace Mainframe.Devices +namespace SicModules.Devices { public class IoInterLock : BaseDevice, IDevice { diff --git a/Modules/Mainframe/Devices/IoLoadRotation.cs b/Modules/Mainframe/Devices/IoLoadRotation.cs index 2362bea..9cb7e76 100644 --- a/Modules/Mainframe/Devices/IoLoadRotation.cs +++ b/Modules/Mainframe/Devices/IoLoadRotation.cs @@ -1,15 +1,13 @@ -using Aitex.Core.RT.DataCenter; +using System.Xml; +using Aitex.Core.RT.DataCenter; using Aitex.Core.RT.Device; using Aitex.Core.RT.Event; using Aitex.Core.RT.IOCore; using Aitex.Core.RT.OperationCenter; using Aitex.Core.RT.SCCore; using Aitex.Core.Util; -using MECF.Framework.RT.EquipmentLibrary.Core.Extensions; -using System.Threading; -using System.Xml; -namespace Mainframe.Devices +namespace SicModules.Devices { public class IoLoadRotation : BaseDevice, IDevice { diff --git a/Modules/Mainframe/Devices/IoPump.cs b/Modules/Mainframe/Devices/IoPump.cs index a0db6ca..753abcc 100644 --- a/Modules/Mainframe/Devices/IoPump.cs +++ b/Modules/Mainframe/Devices/IoPump.cs @@ -1,23 +1,15 @@ -using Aitex.Core.Common.DeviceData; +using System; +using System.Xml; +using Aitex.Core.Common.DeviceData; using Aitex.Core.RT.DataCenter; using Aitex.Core.RT.Device; using Aitex.Core.RT.Event; using Aitex.Core.RT.IOCore; using Aitex.Core.RT.Log; -using Aitex.Core.RT.OperationCenter; -using Aitex.Core.RT.SCCore; using Aitex.Core.Util; using MECF.Framework.Common.Event; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Pumps; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml; -namespace Mainframe.Devices +namespace SicModules.Devices { public class IoPump: BaseDevice, IDevice { diff --git a/Modules/Mainframe/Devices/SicAds.cs b/Modules/Mainframe/Devices/SicAds.cs index eeae85d..7c1736f 100644 --- a/Modules/Mainframe/Devices/SicAds.cs +++ b/Modules/Mainframe/Devices/SicAds.cs @@ -1,7 +1,6 @@ using System.Xml; -using Aitex.Core.RT.SCCore; -namespace Mainframe.Devices +namespace SicModules.Devices { public class SicAds : TcAds { diff --git a/Modules/Mainframe/Devices/SiemensIoProvider.cs b/Modules/Mainframe/Devices/SiemensIoProvider.cs index ed47172..b2cc1b4 100644 --- a/Modules/Mainframe/Devices/SiemensIoProvider.cs +++ b/Modules/Mainframe/Devices/SiemensIoProvider.cs @@ -1,15 +1,15 @@ -using Aitex.Core.RT.Device; +using System; +using System.Collections.Generic; +using System.Xml; +using Aitex.Core.RT.Device; using Aitex.Core.RT.IOCore; using Aitex.Core.RT.Log; using Aitex.Core.Util; using MECF.Framework.Common.IOCore; using MECF.Framework.Common.PLC; using MECF.Framework.RT.Core.IoProviders; -using System; -using System.Collections.Generic; -using System.Xml; -namespace Mainframe.Devices +namespace SicModules.Devices { public partial class SiemensIoProvider : IoProvider { diff --git a/Modules/Mainframe/Devices/TcAds.cs b/Modules/Mainframe/Devices/TcAds.cs index 9d367d5..5d68f94 100644 --- a/Modules/Mainframe/Devices/TcAds.cs +++ b/Modules/Mainframe/Devices/TcAds.cs @@ -4,15 +4,13 @@ using System.Text.RegularExpressions; using System.Xml; using Aitex.Core.RT.Device; using Aitex.Core.RT.Event; -using Aitex.Core.RT.Log; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Communications; using MECF.Framework.Common.Event; using MECF.Framework.Common.PLC; using MECF.Framework.RT.Core.IoProviders.Siemens; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Efems.Rorzes; -namespace Mainframe.Devices +namespace SicModules.Devices { diff --git a/Modules/Mainframe/EFEMs/EFEMModule.cs b/Modules/Mainframe/EFEMs/EFEMModule.cs index f7952bc..291add3 100644 --- a/Modules/Mainframe/EFEMs/EFEMModule.cs +++ b/Modules/Mainframe/EFEMs/EFEMModule.cs @@ -1,17 +1,16 @@ -using Aitex.Core.RT.DataCenter; +using System; +using Aitex.Core.RT.DataCenter; using Aitex.Core.RT.Device; -using Aitex.Core.RT.Event; using Aitex.Core.RT.Fsm; using Aitex.Core.RT.OperationCenter; using Aitex.Core.RT.Routine; -using Aitex.Core.Util; using Aitex.Core.Utilities; using Aitex.Sorter.Common; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Schedulers; -using System; +using SicModules.EFEMs.Routines; -namespace Mainframe.EFEMs +namespace SicModules.EFEMs { public class EFEMModule : EFEMModuleBase { diff --git a/Modules/Mainframe/EFEMs/EFEMModuleBase.cs b/Modules/Mainframe/EFEMs/EFEMModuleBase.cs index 27aed1b..607fd35 100644 --- a/Modules/Mainframe/EFEMs/EFEMModuleBase.cs +++ b/Modules/Mainframe/EFEMs/EFEMModuleBase.cs @@ -5,9 +5,8 @@ using MECF.Framework.Common.Fsm; using MECF.Framework.Common.Schedulers; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.LogicUnits; -using System; -namespace Mainframe.EFEMs +namespace SicModules.EFEMs { public abstract class EFEMModuleBase : ModuleFsmDevice, ITransferTarget, IModuleDevice { diff --git a/Modules/Mainframe/EFEMs/EfemBaseRoutine.cs b/Modules/Mainframe/EFEMs/Routines/Base/EfemBaseRoutine.cs similarity index 99% rename from Modules/Mainframe/EFEMs/EfemBaseRoutine.cs rename to Modules/Mainframe/EFEMs/Routines/Base/EfemBaseRoutine.cs index 900d227..620b8ce 100644 --- a/Modules/Mainframe/EFEMs/EfemBaseRoutine.cs +++ b/Modules/Mainframe/EFEMs/Routines/Base/EfemBaseRoutine.cs @@ -1,20 +1,20 @@ -using Aitex.Core.RT.Device; +using System; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Mainframe.Devices; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Aligners.HwAligner; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.EFEM; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.RobotBase; -using System; using static MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.RobotBase.RobotBaseDevice; +using IoInterLock = SicModules.Devices.IoInterLock; -namespace Mainframe.EFEMs +namespace SicModules.EFEMs.Routines.Base { public class EfemBaseRoutine : ModuleRoutine, IRoutine { @@ -32,7 +32,7 @@ namespace Mainframe.EFEMs public IoSensor _cassALWaferConvex; //凸片检测 public IoSensor _cassARWaferConvex; //凸片检测 public IoSensor _cassBLWaferConvex; //凸片检测 - private Mainframe.Devices.IoInterLock _tmIoInterLock; + private IoInterLock _tmIoInterLock; public IoLift4 _llLift; public IoClaw _loadWaferClaw; @@ -71,7 +71,7 @@ namespace Mainframe.EFEMs _cassAL6Inch = DEVICE.GetDevice($"TM.CassALInch6Sensor"); _cassAR6Inch = DEVICE.GetDevice($"TM.CassARInch6Sensor"); _cassBL6Inch = DEVICE.GetDevice($"TM.CassBLInch6Sensor"); - _tmIoInterLock = DEVICE.GetDevice("TM.IoInterLock"); + _tmIoInterLock = DEVICE.GetDevice("TM.IoInterLock"); _llLift= DEVICE.GetDevice($"LoadLock.LLLift"); _unLoadLift= DEVICE.GetDevice($"UnLoad.UnLoadLift"); diff --git a/Modules/Mainframe/EFEMs/EFEMHomeRoutine.cs b/Modules/Mainframe/EFEMs/Routines/EFEMHomeRoutine.cs similarity index 94% rename from Modules/Mainframe/EFEMs/EFEMHomeRoutine.cs rename to Modules/Mainframe/EFEMs/Routines/EFEMHomeRoutine.cs index 9a9999d..1ba4702 100644 --- a/Modules/Mainframe/EFEMs/EFEMHomeRoutine.cs +++ b/Modules/Mainframe/EFEMs/Routines/EFEMHomeRoutine.cs @@ -1,9 +1,8 @@ using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; -using Aitex.Core.RT.SCCore; -using MECF.Framework.Common.Equipment; +using SicModules.EFEMs.Routines.Base; -namespace Mainframe.EFEMs +namespace SicModules.EFEMs.Routines { public class EFEMHomeRoutine : EfemBaseRoutine { diff --git a/Modules/Mainframe/EFEMs/EfemSlitValveRoutine.cs b/Modules/Mainframe/EFEMs/Routines/EfemSlitValveRoutine.cs similarity index 97% rename from Modules/Mainframe/EFEMs/EfemSlitValveRoutine.cs rename to Modules/Mainframe/EFEMs/Routines/EfemSlitValveRoutine.cs index af4251c..3c063f1 100644 --- a/Modules/Mainframe/EFEMs/EfemSlitValveRoutine.cs +++ b/Modules/Mainframe/EFEMs/Routines/EfemSlitValveRoutine.cs @@ -1,16 +1,19 @@ -using Aitex.Core.RT.Device; +using System; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Mainframe.LLs; -using Mainframe.TMs; -using Mainframe.UnLoads; using MECF.Framework.Common.Equipment; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.UnLoad; -using System; +using SicModules.EFEMs.Routines.Base; +using SicModules.LLs; +using SicModules.LLs.Routines; +using SicModules.TMs; +using SicModules.UnLoads; +using SicModules.UnLoads.Routines; -namespace Mainframe.EFEMs +namespace SicModules.EFEMs.Routines { public class EfemSlitValveRoutine : EfemBaseRoutine { diff --git a/Modules/Mainframe/EFEMs/TrayRobotHomeRoutine.cs b/Modules/Mainframe/EFEMs/Routines/TrayRobotHomeRoutine.cs similarity index 94% rename from Modules/Mainframe/EFEMs/TrayRobotHomeRoutine.cs rename to Modules/Mainframe/EFEMs/Routines/TrayRobotHomeRoutine.cs index de28294..e85504e 100644 --- a/Modules/Mainframe/EFEMs/TrayRobotHomeRoutine.cs +++ b/Modules/Mainframe/EFEMs/Routines/TrayRobotHomeRoutine.cs @@ -1,9 +1,9 @@ using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using MECF.Framework.Common.Equipment; +using SicModules.EFEMs.Routines.Base; -namespace Mainframe.EFEMs +namespace SicModules.EFEMs.Routines { public class TrayRobotHomeRoutine : EfemBaseRoutine { diff --git a/Modules/Mainframe/EFEMs/TrayRobotMapRoutine.cs b/Modules/Mainframe/EFEMs/Routines/TrayRobotMapRoutine.cs similarity index 96% rename from Modules/Mainframe/EFEMs/TrayRobotMapRoutine.cs rename to Modules/Mainframe/EFEMs/Routines/TrayRobotMapRoutine.cs index c1cd29f..0e35c17 100644 --- a/Modules/Mainframe/EFEMs/TrayRobotMapRoutine.cs +++ b/Modules/Mainframe/EFEMs/Routines/TrayRobotMapRoutine.cs @@ -3,9 +3,9 @@ using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots; +using SicModules.EFEMs.Routines.Base; -namespace Mainframe.EFEMs +namespace SicModules.EFEMs.Routines { public class TrayRobotMapRoutine : EfemBaseRoutine { diff --git a/Modules/Mainframe/EFEMs/TrayRobotPickRoutine.cs b/Modules/Mainframe/EFEMs/Routines/TrayRobotPickRoutine.cs similarity index 98% rename from Modules/Mainframe/EFEMs/TrayRobotPickRoutine.cs rename to Modules/Mainframe/EFEMs/Routines/TrayRobotPickRoutine.cs index e185998..1c34f1e 100644 --- a/Modules/Mainframe/EFEMs/TrayRobotPickRoutine.cs +++ b/Modules/Mainframe/EFEMs/Routines/TrayRobotPickRoutine.cs @@ -2,12 +2,13 @@ using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Mainframe.LLs; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots; +using SicModules.EFEMs.Routines.Base; +using SicModules.LLs.Routines; -namespace Mainframe.EFEMs +namespace SicModules.EFEMs.Routines { public class TrayRobotPickRoutine : EfemBaseRoutine { diff --git a/Modules/Mainframe/EFEMs/TrayRobotPlaceRoutine.cs b/Modules/Mainframe/EFEMs/Routines/TrayRobotPlaceRoutine.cs similarity index 98% rename from Modules/Mainframe/EFEMs/TrayRobotPlaceRoutine.cs rename to Modules/Mainframe/EFEMs/Routines/TrayRobotPlaceRoutine.cs index 4050cab..5929b65 100644 --- a/Modules/Mainframe/EFEMs/TrayRobotPlaceRoutine.cs +++ b/Modules/Mainframe/EFEMs/Routines/TrayRobotPlaceRoutine.cs @@ -3,14 +3,14 @@ using Aitex.Core.RT.Event; using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Mainframe.Devices; -using Mainframe.LLs; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots; -using System; +using SicModules.Devices; +using SicModules.EFEMs.Routines.Base; +using SicModules.LLs.Routines; -namespace Mainframe.EFEMs +namespace SicModules.EFEMs.Routines { public class TrayRobotPlaceRoutine : EfemBaseRoutine { diff --git a/Modules/Mainframe/EFEMs/WaferRobotHomeRoutine.cs b/Modules/Mainframe/EFEMs/Routines/WaferRobotHomeRoutine.cs similarity index 94% rename from Modules/Mainframe/EFEMs/WaferRobotHomeRoutine.cs rename to Modules/Mainframe/EFEMs/Routines/WaferRobotHomeRoutine.cs index 6ef9bfe..14646c6 100644 --- a/Modules/Mainframe/EFEMs/WaferRobotHomeRoutine.cs +++ b/Modules/Mainframe/EFEMs/Routines/WaferRobotHomeRoutine.cs @@ -1,9 +1,9 @@ using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using MECF.Framework.Common.Equipment; +using SicModules.EFEMs.Routines.Base; -namespace Mainframe.EFEMs +namespace SicModules.EFEMs.Routines { public class WaferRobotHomeRoutine : EfemBaseRoutine { diff --git a/Modules/Mainframe/EFEMs/WaferRobotMapRoutine.cs b/Modules/Mainframe/EFEMs/Routines/WaferRobotMapRoutine.cs similarity index 97% rename from Modules/Mainframe/EFEMs/WaferRobotMapRoutine.cs rename to Modules/Mainframe/EFEMs/Routines/WaferRobotMapRoutine.cs index 2467a76..43e1b9f 100644 --- a/Modules/Mainframe/EFEMs/WaferRobotMapRoutine.cs +++ b/Modules/Mainframe/EFEMs/Routines/WaferRobotMapRoutine.cs @@ -3,9 +3,9 @@ using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; +using SicModules.EFEMs.Routines.Base; - -namespace Mainframe.EFEMs +namespace SicModules.EFEMs.Routines { public class WaferRobotMapRoutine : EfemBaseRoutine { diff --git a/Modules/Mainframe/EFEMs/WaferRobotPickRoutine.cs b/Modules/Mainframe/EFEMs/Routines/WaferRobotPickRoutine.cs similarity index 98% rename from Modules/Mainframe/EFEMs/WaferRobotPickRoutine.cs rename to Modules/Mainframe/EFEMs/Routines/WaferRobotPickRoutine.cs index c2d644b..8c96356 100644 --- a/Modules/Mainframe/EFEMs/WaferRobotPickRoutine.cs +++ b/Modules/Mainframe/EFEMs/Routines/WaferRobotPickRoutine.cs @@ -4,14 +4,14 @@ using Aitex.Core.RT.Event; using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Mainframe.Aligners; -using Mainframe.LLs; -using Mainframe.UnLoads; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots; +using SicModules.EFEMs.Routines.Base; +using SicModules.LLs.Routines; +using SicModules.UnLoads.Routines; -namespace Mainframe.EFEMs +namespace SicModules.EFEMs.Routines { public class WaferRobotPickRoutine : EfemBaseRoutine { diff --git a/Modules/Mainframe/EFEMs/WaferRobotPlaceRoutine.cs b/Modules/Mainframe/EFEMs/Routines/WaferRobotPlaceRoutine.cs similarity index 96% rename from Modules/Mainframe/EFEMs/WaferRobotPlaceRoutine.cs rename to Modules/Mainframe/EFEMs/Routines/WaferRobotPlaceRoutine.cs index 49b3c58..059efca 100644 --- a/Modules/Mainframe/EFEMs/WaferRobotPlaceRoutine.cs +++ b/Modules/Mainframe/EFEMs/Routines/WaferRobotPlaceRoutine.cs @@ -1,18 +1,15 @@ -using Aitex.Core.RT.Device; -using Aitex.Core.RT.Event; +using Aitex.Core.RT.Event; using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Mainframe.LLs; -using Mainframe.UnLoads; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Aligners.HwAligner; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots; -using System; +using SicModules.EFEMs.Routines.Base; +using SicModules.LLs.Routines; +using SicModules.UnLoads.Routines; -namespace Mainframe.EFEMs +namespace SicModules.EFEMs.Routines { public class WaferRobotPlaceRoutine : EfemBaseRoutine { diff --git a/Modules/Mainframe/EFEMs/SicEFEM.cs b/Modules/Mainframe/EFEMs/SicEFEM.cs index a5ac9f5..0929b62 100644 --- a/Modules/Mainframe/EFEMs/SicEFEM.cs +++ b/Modules/Mainframe/EFEMs/SicEFEM.cs @@ -1,12 +1,11 @@ -using Aitex.Core.RT.Device; +using System.Xml; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.EFEM; -using System.Collections.Generic; -using System.Xml; -namespace Mainframe.EFEMs +namespace SicModules.EFEMs { public class SicEFEM : EFEM { diff --git a/Modules/Mainframe/EFEMs/SicTrayRobot.cs b/Modules/Mainframe/EFEMs/SicTrayRobot.cs index d11b5a8..1bae2eb 100644 --- a/Modules/Mainframe/EFEMs/SicTrayRobot.cs +++ b/Modules/Mainframe/EFEMs/SicTrayRobot.cs @@ -1,13 +1,8 @@ -using MECF.Framework.Common.Equipment; +using System.Xml; +using MECF.Framework.Common.Equipment; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.HwinRobot; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml; -namespace Mainframe.EFEMs +namespace SicModules.EFEMs { public class SicTrayRobot : HwinRobotB { diff --git a/Modules/Mainframe/EFEMs/SicWaferRobot.cs b/Modules/Mainframe/EFEMs/SicWaferRobot.cs index 5272a36..a1a249b 100644 --- a/Modules/Mainframe/EFEMs/SicWaferRobot.cs +++ b/Modules/Mainframe/EFEMs/SicWaferRobot.cs @@ -1,13 +1,8 @@ -using MECF.Framework.Common.Equipment; +using System.Xml; +using MECF.Framework.Common.Equipment; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.HwinRobot; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml; -namespace Mainframe.EFEMs +namespace SicModules.EFEMs { public class SicWaferRobot : HwinRobot { diff --git a/Modules/Mainframe/EFEMs/TrayRobotModule.cs b/Modules/Mainframe/EFEMs/TrayRobotModule.cs index 7e10a41..09331bc 100644 --- a/Modules/Mainframe/EFEMs/TrayRobotModule.cs +++ b/Modules/Mainframe/EFEMs/TrayRobotModule.cs @@ -1,18 +1,16 @@ -using Aitex.Core.RT.DataCenter; +using System; +using Aitex.Core.RT.DataCenter; using Aitex.Core.RT.Device; -using Aitex.Core.RT.Event; using Aitex.Core.RT.Fsm; using Aitex.Core.RT.OperationCenter; using Aitex.Core.RT.Routine; -using Aitex.Core.Util; using Aitex.Core.Utilities; using Aitex.Sorter.Common; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Fsm; -using MECF.Framework.Common.Schedulers; -using System; +using SicModules.EFEMs.Routines; -namespace Mainframe.EFEMs +namespace SicModules.EFEMs { public class TrayRobotModule : ModuleFsmDevice, IModuleDevice { diff --git a/Modules/Mainframe/EFEMs/WaferRobotModule.cs b/Modules/Mainframe/EFEMs/WaferRobotModule.cs index 8752f7a..dc651d8 100644 --- a/Modules/Mainframe/EFEMs/WaferRobotModule.cs +++ b/Modules/Mainframe/EFEMs/WaferRobotModule.cs @@ -1,18 +1,16 @@ -using Aitex.Core.RT.DataCenter; +using System; +using Aitex.Core.RT.DataCenter; using Aitex.Core.RT.Device; -using Aitex.Core.RT.Event; using Aitex.Core.RT.Fsm; using Aitex.Core.RT.OperationCenter; using Aitex.Core.RT.Routine; -using Aitex.Core.Util; using Aitex.Core.Utilities; using Aitex.Sorter.Common; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Fsm; -using MECF.Framework.Common.Schedulers; -using System; +using SicModules.EFEMs.Routines; -namespace Mainframe.EFEMs +namespace SicModules.EFEMs { public class WaferRobotModule : ModuleFsmDevice, IModuleDevice { diff --git a/Modules/Mainframe/LLs/LoadLockModule.cs b/Modules/Mainframe/LLs/LoadLockModule.cs index 100e57f..04b1e37 100644 --- a/Modules/Mainframe/LLs/LoadLockModule.cs +++ b/Modules/Mainframe/LLs/LoadLockModule.cs @@ -1,25 +1,21 @@ -using Aitex.Core.RT.DataCenter; +using System; +using System.Threading; +using System.Threading.Tasks; +using Aitex.Core.RT.DataCenter; using Aitex.Core.RT.Device; using Aitex.Core.RT.Event; using Aitex.Core.RT.Fsm; -using Aitex.Core.RT.Log; using Aitex.Core.RT.OperationCenter; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using Aitex.Core.Util; using Aitex.Core.Utilities; using Aitex.Sorter.Common; -using Mainframe.TMs; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Schedulers; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; +using SicModules.LLs.Routines; -namespace Mainframe.LLs +namespace SicModules.LLs { public class LoadLockModule : LoadLockModuleBase { diff --git a/Modules/Mainframe/LLs/LoadLockModuleBase.cs b/Modules/Mainframe/LLs/LoadLockModuleBase.cs index 1a39d0e..19d5f8f 100644 --- a/Modules/Mainframe/LLs/LoadLockModuleBase.cs +++ b/Modules/Mainframe/LLs/LoadLockModuleBase.cs @@ -6,7 +6,7 @@ using MECF.Framework.Common.Schedulers; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.LogicUnits; -namespace Mainframe.LLs +namespace SicModules.LLs { public abstract class LoadLockModuleBase : ModuleFsmDevice, ITransferTarget, IModuleDevice { diff --git a/Modules/Mainframe/LLs/LoadLockBaseRoutine.cs b/Modules/Mainframe/LLs/Routines/Base/LoadLockBaseRoutine.cs similarity index 97% rename from Modules/Mainframe/LLs/LoadLockBaseRoutine.cs rename to Modules/Mainframe/LLs/Routines/Base/LoadLockBaseRoutine.cs index 2444e4b..b936f78 100644 --- a/Modules/Mainframe/LLs/LoadLockBaseRoutine.cs +++ b/Modules/Mainframe/LLs/Routines/Base/LoadLockBaseRoutine.cs @@ -1,17 +1,17 @@ using System; using System.Collections.Generic; using Aitex.Core.RT.Device; +using Aitex.Core.RT.Device.Devices; +using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Routine; using MECF.Framework.Common.Equipment; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; -using Mainframe.TMs; -using Aitex.Core.RT.Device.Unit; -using Mainframe.Devices; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.MachineVision.Keyence; -using Aitex.Core.RT.Device.Devices; +using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; +using SicModules.Devices; +using SicModules.TMs; -namespace Mainframe.LLs +namespace SicModules.LLs.Routines.Base { public class LoadLockBaseRoutine : ModuleRoutine, IRoutine { @@ -50,9 +50,9 @@ namespace Mainframe.LLs private IoClaw _llWaferClaw = null; private IoClaw _llTrayClaw = null; private KeyenceCVX300F _loadCCD = null; - public IoSensor _loadTrayHomeSensor; //Trayλ - public IoSensor _loadWaferPlaced; //¶䣬Wafer - public IoSensor _loadTrayPlaced; // + public IoSensor _loadTrayHomeSensor; //Tray定位 + public IoSensor _loadWaferPlaced; //上下对射，检测Wafer有无 + public IoSensor _loadTrayPlaced; //检测托盘有无 public LoadLockBaseRoutine() : base(ModuleName.LoadLock.ToString()) @@ -264,12 +264,12 @@ namespace Mainframe.LLs { Tuple ret = ExecuteAndWait(id, () => { - //κζ + //不做任何动作 return true; }, () => { - //RotationError + //检测Rotation电机Error if (_llRotation.IsServoError) { Stop($"Set {Module} Rotation Servo Error"); @@ -330,20 +330,20 @@ namespace Mainframe.LLs // return true; // }, () => // { - // //⵽δźSensorź + // //检测到未放好Sensor信号 // if (!_loadWaferPlaced.Value) // { - // //ʧܺStop + // //失败后Stop电机 // _llRotation.Stop(out _); // Stop($"Set {Module} Rotation One Circle Wafter check sensor fail [TM DI-35]"); // WaitMoveOneCircleDoneResult = Result.VERIFYFAIL; // return true; // } - // //RotationError + // //检测Rotation电机Error // if (_llRotation.IsServoError) // { - // //ʧܺStop + // //失败后Stop电机 // _llRotation.Stop(out _); // Stop($"Set {Module} Rotation Servo Error"); // WaitMoveOneCircleDoneResult = Result.VERIFYFAIL; @@ -392,20 +392,20 @@ namespace Mainframe.LLs }, () => { DISensroQueuen.Enqueue(_loadWaferPlaced.Value); - //⵽δźSensorź + //检测到未放好Sensor信号 //if (!_loadWaferPlaced.Value) //{ - // //ʧܺStop + // //失败后Stop电机 // _llRotation.Stop(out _); // Stop($"Set {Module} Rotation One Circle Wafter check sensor fail [TM DI-35]"); // WaitMoveOneCircleDoneResult = Result.VERIFYFAIL; // return true; //} - //RotationError + //检测Rotation电机Error if (_llRotation.IsServoError) { - //ʧܺStop + //失败后Stop电机 _llRotation.Stop(out _); Stop($"Set {Module} Rotation Servo Error"); return null; diff --git a/Modules/Mainframe/LLs/LoadHomeRoutine.cs b/Modules/Mainframe/LLs/Routines/LoadHomeRoutine.cs similarity index 96% rename from Modules/Mainframe/LLs/LoadHomeRoutine.cs rename to Modules/Mainframe/LLs/Routines/LoadHomeRoutine.cs index e034e46..89cab8f 100644 --- a/Modules/Mainframe/LLs/LoadHomeRoutine.cs +++ b/Modules/Mainframe/LLs/Routines/LoadHomeRoutine.cs @@ -1,10 +1,11 @@ -using Aitex.Core.RT.Log; +using System; +using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using System; +using SicModules.LLs.Routines.Base; -namespace Mainframe.LLs +namespace SicModules.LLs.Routines { public class LoadHomeRoutine : LoadLockBaseRoutine { diff --git a/Modules/Mainframe/LLs/LoadLockClawRoutine.cs b/Modules/Mainframe/LLs/Routines/LoadLockClawRoutine.cs similarity index 94% rename from Modules/Mainframe/LLs/LoadLockClawRoutine.cs rename to Modules/Mainframe/LLs/Routines/LoadLockClawRoutine.cs index b172792..8cf46a3 100644 --- a/Modules/Mainframe/LLs/LoadLockClawRoutine.cs +++ b/Modules/Mainframe/LLs/Routines/LoadLockClawRoutine.cs @@ -1,10 +1,9 @@ -using System; -using Aitex.Core.RT.Device; -using Aitex.Core.RT.Device.Unit; +using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; +using SicModules.LLs.Routines.Base; -namespace Mainframe.LLs +namespace SicModules.LLs.Routines { public class LoadLockClawRoutine : LoadLockBaseRoutine { diff --git a/Modules/Mainframe/LLs/LoadLockGroupRoutine.cs b/Modules/Mainframe/LLs/Routines/LoadLockGroupRoutine.cs similarity index 97% rename from Modules/Mainframe/LLs/LoadLockGroupRoutine.cs rename to Modules/Mainframe/LLs/Routines/LoadLockGroupRoutine.cs index 77d2948..05ff7f3 100644 --- a/Modules/Mainframe/LLs/LoadLockGroupRoutine.cs +++ b/Modules/Mainframe/LLs/Routines/LoadLockGroupRoutine.cs @@ -1,12 +1,10 @@ -using Aitex.Core.RT.Device; -using Aitex.Core.RT.Device.Unit; +using System.Linq; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.MachineVision.Keyence; -using System.Linq; +using SicModules.LLs.Routines.Base; -namespace Mainframe.LLs +namespace SicModules.LLs.Routines { public class LoadLockGroupRoutine : LoadLockBaseRoutine { diff --git a/Modules/Mainframe/LLs/LoadLockLeakCheckRoutine.cs b/Modules/Mainframe/LLs/Routines/LoadLockLeakCheckRoutine.cs similarity index 98% rename from Modules/Mainframe/LLs/LoadLockLeakCheckRoutine.cs rename to Modules/Mainframe/LLs/Routines/LoadLockLeakCheckRoutine.cs index 01fae72..606f05d 100644 --- a/Modules/Mainframe/LLs/LoadLockLeakCheckRoutine.cs +++ b/Modules/Mainframe/LLs/Routines/LoadLockLeakCheckRoutine.cs @@ -1,17 +1,15 @@ using System; using System.Diagnostics; using Aitex.Core.RT.Device; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Mainframe.Devices; using MECF.Framework.Common.DBCore; using MECF.Framework.Common.Equipment; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; +using SicModules.Devices; +using SicModules.LLs.Routines.Base; -namespace Mainframe.LLs +namespace SicModules.LLs.Routines { public class LoadLockLeakCheckRoutine : LoadLockBaseRoutine { diff --git a/Modules/Mainframe/LLs/LoadLockLiftRoutine.cs b/Modules/Mainframe/LLs/Routines/LoadLockLiftRoutine.cs similarity index 91% rename from Modules/Mainframe/LLs/LoadLockLiftRoutine.cs rename to Modules/Mainframe/LLs/Routines/LoadLockLiftRoutine.cs index a3c4939..77fc483 100644 --- a/Modules/Mainframe/LLs/LoadLockLiftRoutine.cs +++ b/Modules/Mainframe/LLs/Routines/LoadLockLiftRoutine.cs @@ -1,9 +1,8 @@ -using Aitex.Core.RT.Device; -using Aitex.Core.RT.Device.Unit; -using Aitex.Core.RT.Routine; +using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; +using SicModules.LLs.Routines.Base; -namespace Mainframe.LLs +namespace SicModules.LLs.Routines { public class LoadLockLiftRoutine : LoadLockBaseRoutine { diff --git a/Modules/Mainframe/LLs/LoadLockPrepareTransferRoutine.cs b/Modules/Mainframe/LLs/Routines/LoadLockPrepareTransferRoutine.cs similarity index 98% rename from Modules/Mainframe/LLs/LoadLockPrepareTransferRoutine.cs rename to Modules/Mainframe/LLs/Routines/LoadLockPrepareTransferRoutine.cs index e252574..1d7d76e 100644 --- a/Modules/Mainframe/LLs/LoadLockPrepareTransferRoutine.cs +++ b/Modules/Mainframe/LLs/Routines/LoadLockPrepareTransferRoutine.cs @@ -1,10 +1,10 @@ -using System; -using Aitex.Core.RT.Event; +using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; +using SicModules.LLs.Routines.Base; -namespace Mainframe.LLs +namespace SicModules.LLs.Routines { public class LoadLockPrepareTransferRoutine : LoadLockBaseRoutine { diff --git a/Modules/Mainframe/LLs/LoadLockPumpRoutine.cs b/Modules/Mainframe/LLs/Routines/LoadLockPumpRoutine.cs similarity index 96% rename from Modules/Mainframe/LLs/LoadLockPumpRoutine.cs rename to Modules/Mainframe/LLs/Routines/LoadLockPumpRoutine.cs index 2deb86c..680b569 100644 --- a/Modules/Mainframe/LLs/LoadLockPumpRoutine.cs +++ b/Modules/Mainframe/LLs/Routines/LoadLockPumpRoutine.cs @@ -1,17 +1,13 @@ -using System; -using System.Text; +using System.Diagnostics; using Aitex.Core.RT.Device; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; -using Mainframe.Devices; -using Mainframe.TMs; -using System.Diagnostics; +using SicModules.Devices; +using SicModules.LLs.Routines.Base; -namespace Mainframe.LLs +namespace SicModules.LLs.Routines { public class LoadLockPumpRoutine : LoadLockBaseRoutine { diff --git a/Modules/Mainframe/LLs/LoadLockPurgeRoutine.cs b/Modules/Mainframe/LLs/Routines/LoadLockPurgeRoutine.cs similarity index 94% rename from Modules/Mainframe/LLs/LoadLockPurgeRoutine.cs rename to Modules/Mainframe/LLs/Routines/LoadLockPurgeRoutine.cs index e346e02..b89d3c7 100644 --- a/Modules/Mainframe/LLs/LoadLockPurgeRoutine.cs +++ b/Modules/Mainframe/LLs/Routines/LoadLockPurgeRoutine.cs @@ -1,18 +1,13 @@ -using System; -using System.Diagnostics; +using System.Diagnostics; using Aitex.Core.RT.Device; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Mainframe.Devices; -using Mainframe.TMs; using MECF.Framework.Common.Equipment; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robot.MAG7; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; +using SicModules.Devices; +using SicModules.LLs.Routines.Base; -namespace Mainframe.LLs +namespace SicModules.LLs.Routines { public class LoadLockPurgeRoutine : LoadLockBaseRoutine { diff --git a/Modules/Mainframe/LLs/LoadLockServoToRoutine.cs b/Modules/Mainframe/LLs/Routines/LoadLockServoToRoutine.cs similarity index 93% rename from Modules/Mainframe/LLs/LoadLockServoToRoutine.cs rename to Modules/Mainframe/LLs/Routines/LoadLockServoToRoutine.cs index ef98752..df3f5b7 100644 --- a/Modules/Mainframe/LLs/LoadLockServoToRoutine.cs +++ b/Modules/Mainframe/LLs/Routines/LoadLockServoToRoutine.cs @@ -1,18 +1,11 @@ using System; -using System.Text; -using Aitex.Core.RT.Device; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robot.MAG7; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; -using Mainframe.Devices; -using Mainframe.TMs; +using SicModules.LLs.Routines.Base; -namespace Mainframe.LLs +namespace SicModules.LLs.Routines { public class LoadLockServoToRoutine : LoadLockBaseRoutine { diff --git a/Modules/Mainframe/LLs/LoadLockTrayAlignerRoutine.cs b/Modules/Mainframe/LLs/Routines/LoadLockTrayAlignerRoutine.cs similarity index 61% rename from Modules/Mainframe/LLs/LoadLockTrayAlignerRoutine.cs rename to Modules/Mainframe/LLs/Routines/LoadLockTrayAlignerRoutine.cs index 6893294..5a1dc18 100644 --- a/Modules/Mainframe/LLs/LoadLockTrayAlignerRoutine.cs +++ b/Modules/Mainframe/LLs/Routines/LoadLockTrayAlignerRoutine.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using SicModules.LLs.Routines.Base; -namespace Mainframe.LLs +namespace SicModules.LLs.Routines { public class LoadLockTrayAlignerRoutine:LoadLockBaseRoutine { diff --git a/Modules/Mainframe/LLs/LoadLockTrayClawRoutine.cs b/Modules/Mainframe/LLs/Routines/LoadLockTrayClawRoutine.cs similarity index 90% rename from Modules/Mainframe/LLs/LoadLockTrayClawRoutine.cs rename to Modules/Mainframe/LLs/Routines/LoadLockTrayClawRoutine.cs index 12ab0c9..670bd53 100644 --- a/Modules/Mainframe/LLs/LoadLockTrayClawRoutine.cs +++ b/Modules/Mainframe/LLs/Routines/LoadLockTrayClawRoutine.cs @@ -1,14 +1,9 @@ using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Routine; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; +using SicModules.LLs.Routines.Base; -namespace Mainframe.LLs +namespace SicModules.LLs.Routines { public class LoadLockTrayClawRoutine : LoadLockBaseRoutine { diff --git a/Modules/Mainframe/LLs/LoadLockVentRoutine.cs b/Modules/Mainframe/LLs/Routines/LoadLockVentRoutine.cs similarity index 95% rename from Modules/Mainframe/LLs/LoadLockVentRoutine.cs rename to Modules/Mainframe/LLs/Routines/LoadLockVentRoutine.cs index 0bc6562..ab979d8 100644 --- a/Modules/Mainframe/LLs/LoadLockVentRoutine.cs +++ b/Modules/Mainframe/LLs/Routines/LoadLockVentRoutine.cs @@ -1,16 +1,13 @@ -using System; -using System.Diagnostics; +using System.Diagnostics; using Aitex.Core.RT.Device; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Mainframe.Devices; -using Mainframe.TMs; using MECF.Framework.Common.Equipment; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; +using SicModules.Devices; +using SicModules.LLs.Routines.Base; -namespace Mainframe.LLs +namespace SicModules.LLs.Routines { public class LoadLockVentRoutine : LoadLockBaseRoutine { diff --git a/Modules/Mainframe/LLs/LoadRotationHomeOffsetRoutine.cs b/Modules/Mainframe/LLs/Routines/LoadRotationHomeOffsetRoutine.cs similarity index 92% rename from Modules/Mainframe/LLs/LoadRotationHomeOffsetRoutine.cs rename to Modules/Mainframe/LLs/Routines/LoadRotationHomeOffsetRoutine.cs index 07ac57a..536470a 100644 --- a/Modules/Mainframe/LLs/LoadRotationHomeOffsetRoutine.cs +++ b/Modules/Mainframe/LLs/Routines/LoadRotationHomeOffsetRoutine.cs @@ -1,14 +1,9 @@ using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using MECF.Framework.Common.Equipment; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using SicModules.LLs.Routines.Base; -namespace Mainframe.LLs +namespace SicModules.LLs.Routines { public class LoadRotationHomeOffsetRoutine : LoadLockBaseRoutine { diff --git a/Modules/Mainframe/LLs/LoadSeparateRoutine.cs b/Modules/Mainframe/LLs/Routines/LoadSeparateRoutine.cs similarity index 91% rename from Modules/Mainframe/LLs/LoadSeparateRoutine.cs rename to Modules/Mainframe/LLs/Routines/LoadSeparateRoutine.cs index 2c0bd20..d8c8379 100644 --- a/Modules/Mainframe/LLs/LoadSeparateRoutine.cs +++ b/Modules/Mainframe/LLs/Routines/LoadSeparateRoutine.cs @@ -1,14 +1,9 @@ -using Aitex.Core.RT.Device.Unit; -using Aitex.Core.RT.Routine; +using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using SicModules.LLs.Routines.Base; -namespace Mainframe.LLs +namespace SicModules.LLs.Routines { public class LoadSeparateRoutine : LoadLockBaseRoutine { diff --git a/Modules/Mainframe/LLs/SicLoadLock.cs b/Modules/Mainframe/LLs/SicLoadLock.cs index 95af071..065d180 100644 --- a/Modules/Mainframe/LLs/SicLoadLock.cs +++ b/Modules/Mainframe/LLs/SicLoadLock.cs @@ -1,18 +1,17 @@ -using Aitex.Core.Common; +using System; +using System.Xml; +using Aitex.Core.Common; using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.SCCore; -using Aitex.Core.Util; -using Mainframe.Devices; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Schedulers; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; -using System; -using System.Xml; +using SicModules.Devices; -namespace Mainframe.LLs +namespace SicModules.LLs { public class SicLoadLock : LoadLock { @@ -85,7 +84,7 @@ namespace Mainframe.LLs _balancePressureDiff = SC.GetValue("TM.PressureBalance.BalanceMaxDiffPressure"); - _IoLoadRotation = DEVICE.GetDevice("Load.Rotation"); + _IoLoadRotation = DEVICE.GetDevice("Load.Rotation"); return base.Initialize(); } diff --git a/Modules/Mainframe/PMs/PM1.cs b/Modules/Mainframe/PMs/PM1.cs index a49c3ad..c2a79eb 100644 --- a/Modules/Mainframe/PMs/PM1.cs +++ b/Modules/Mainframe/PMs/PM1.cs @@ -1,12 +1,6 @@ using MECF.Framework.Common.Equipment; -using SicPM; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Mainframe.PMs +namespace SicModules.PMs { public class PM1: PMModule { diff --git a/Modules/Mainframe/PMs/PM2.cs b/Modules/Mainframe/PMs/PM2.cs index b7d878a..d95bfbe 100644 --- a/Modules/Mainframe/PMs/PM2.cs +++ b/Modules/Mainframe/PMs/PM2.cs @@ -1,12 +1,6 @@ using MECF.Framework.Common.Equipment; -using SicPM; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Mainframe.PMs +namespace SicModules.PMs { public class PM2: PMModule { diff --git a/Modules/Mainframe/PMs/Support/PMModule.cs b/Modules/Mainframe/PMs/PMModule.cs similarity index 99% rename from Modules/Mainframe/PMs/Support/PMModule.cs rename to Modules/Mainframe/PMs/PMModule.cs index 1499f56..1b45024 100644 --- a/Modules/Mainframe/PMs/Support/PMModule.cs +++ b/Modules/Mainframe/PMs/PMModule.cs @@ -2,10 +2,8 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using System.Xml; using Aitex.Core.Common; using Aitex.Core.RT.DataCenter; -using Aitex.Core.RT.Device; using Aitex.Core.RT.Event; using Aitex.Core.RT.Fsm; using Aitex.Core.RT.OperationCenter; @@ -18,12 +16,11 @@ using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Schedulers; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.PMs; -using MECF.Framework.RT.EquipmentLibrary.LogicUnits; -using SicPM.RecipeExecutions; -using SicPM.RecipeRoutine; -using SicPM.Routines; +using SicModules.PMs.RecipeExecutions; +using SicModules.PMs.Routines; +using SicModules.PMs.Routines.Recipe; -namespace SicPM +namespace SicModules.PMs { public partial class PMModule : PMModuleBase, IRecipeExecutor { diff --git a/Modules/Mainframe/PMs/Support/PMModuleDevice.cs b/Modules/Mainframe/PMs/PMModuleDevice.cs similarity index 99% rename from Modules/Mainframe/PMs/Support/PMModuleDevice.cs rename to Modules/Mainframe/PMs/PMModuleDevice.cs index 742ddc2..df2bb6b 100644 --- a/Modules/Mainframe/PMs/Support/PMModuleDevice.cs +++ b/Modules/Mainframe/PMs/PMModuleDevice.cs @@ -1,26 +1,23 @@ -using Aitex.Core.Common.DeviceData; -using Aitex.Core.RT.Device; -using Aitex.Core.RT.Event; -using Aitex.Core.Utilities; -using MECF.Framework.Common.Equipment; -using MECF.Framework.Common.Event; -using MECF.Framework.Common.Schedulers; -using System; +using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Threading.Tasks; -using Aitex.Core.RT.Log; -using Aitex.Core.RT.SCCore; -using MECF.Framework.Common.PLC; -using Aitex.Core.Util; -using Aitex.Core.RT.IOCore; -using Aitex.Sorter.Common; +using Aitex.Core.Common.DeviceData; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; +using Aitex.Core.RT.Event; +using Aitex.Core.RT.SCCore; +using Aitex.Core.Util; +using Aitex.Core.Utilities; +using Aitex.Sorter.Common; +using MECF.Framework.Common.Equipment; +using MECF.Framework.Common.Event; +using MECF.Framework.Common.PLC; +using MECF.Framework.Common.Schedulers; -namespace SicPM +namespace SicModules.PMs { public enum IoGroupName diff --git a/Modules/Mainframe/PMs/Support/PMModuleInterlock.cs b/Modules/Mainframe/PMs/PMModuleInterlock.cs similarity index 64% rename from Modules/Mainframe/PMs/Support/PMModuleInterlock.cs rename to Modules/Mainframe/PMs/PMModuleInterlock.cs index 90df843..f7248ee 100644 --- a/Modules/Mainframe/PMs/Support/PMModuleInterlock.cs +++ b/Modules/Mainframe/PMs/PMModuleInterlock.cs @@ -1,21 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Threading.Tasks; -using Aitex.Core.Common.DeviceData; -using Aitex.Core.RT.Device; -using Aitex.Core.RT.Device.Unit; -using Aitex.Core.RT.Event; -using Aitex.Core.RT.OperationCenter; -using Aitex.Core.Utilities; -using MECF.Framework.Common.Equipment; -using MECF.Framework.Common.Event; +using Aitex.Core.RT.OperationCenter; using MECF.Framework.Common.OperationCenter; -using MECF.Framework.Common.Schedulers; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.PMs; -namespace SicPM +namespace SicModules.PMs { public partial class PMModule { diff --git a/Modules/Mainframe/PMs/Support/RecipeExecutions/CleanRecipe.cs b/Modules/Mainframe/PMs/RecipeExecutions/CleanRecipe.cs similarity index 98% rename from Modules/Mainframe/PMs/Support/RecipeExecutions/CleanRecipe.cs rename to Modules/Mainframe/PMs/RecipeExecutions/CleanRecipe.cs index 2c9ffdf..aa3eede 100644 --- a/Modules/Mainframe/PMs/Support/RecipeExecutions/CleanRecipe.cs +++ b/Modules/Mainframe/PMs/RecipeExecutions/CleanRecipe.cs @@ -1,4 +1,5 @@ -using Aitex.Core.Common.DeviceData; +using System; +using Aitex.Core.Common.DeviceData; using Aitex.Core.RT.Event; using Aitex.Core.RT.Log; using Aitex.Core.RT.OperationCenter; @@ -6,15 +7,11 @@ using Aitex.Core.RT.Routine; using Aitex.Core.Util; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; -using SicPM.Routines; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.PMs; +using SicModules.PMs.Routines; +using SicModules.PMs.Routines.Base; -namespace SicPM.RecipeExecutions +namespace SicModules.PMs.RecipeExecutions { public class CleanRecipe : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/RecipeExecutions/Fdc.cs b/Modules/Mainframe/PMs/RecipeExecutions/Fdc.cs similarity index 98% rename from Modules/Mainframe/PMs/Support/RecipeExecutions/Fdc.cs rename to Modules/Mainframe/PMs/RecipeExecutions/Fdc.cs index e99dbc3..c0b40e8 100644 --- a/Modules/Mainframe/PMs/Support/RecipeExecutions/Fdc.cs +++ b/Modules/Mainframe/PMs/RecipeExecutions/Fdc.cs @@ -2,8 +2,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Xml; using Aitex.Core.RT.DataCenter; using Aitex.Core.RT.Log; @@ -12,7 +10,7 @@ using Aitex.Core.Util; using MECF.Framework.Common.CommonData; using MECF.Framework.Common.SCCore; -namespace SicPM.RecipeExecutions +namespace SicModules.PMs.RecipeExecutions { public class Fdc { diff --git a/Modules/Mainframe/PMs/Support/RecipeExecutions/IRecipeDBCallback.cs b/Modules/Mainframe/PMs/RecipeExecutions/IRecipeDBCallback.cs similarity index 74% rename from Modules/Mainframe/PMs/Support/RecipeExecutions/IRecipeDBCallback.cs rename to Modules/Mainframe/PMs/RecipeExecutions/IRecipeDBCallback.cs index c3898d8..ce50812 100644 --- a/Modules/Mainframe/PMs/Support/RecipeExecutions/IRecipeDBCallback.cs +++ b/Modules/Mainframe/PMs/RecipeExecutions/IRecipeDBCallback.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using MECF.Framework.Common.CommonData; -namespace SicPM.RecipeExecutions +namespace SicModules.PMs.RecipeExecutions { public interface IRecipeDBCallback { diff --git a/Modules/Mainframe/PMs/Support/RecipeExecutions/IRecipeExecutor.cs b/Modules/Mainframe/PMs/RecipeExecutions/IRecipeExecutor.cs similarity index 79% rename from Modules/Mainframe/PMs/Support/RecipeExecutions/IRecipeExecutor.cs rename to Modules/Mainframe/PMs/RecipeExecutions/IRecipeExecutor.cs index 1ed1292..b2761a4 100644 --- a/Modules/Mainframe/PMs/Support/RecipeExecutions/IRecipeExecutor.cs +++ b/Modules/Mainframe/PMs/RecipeExecutions/IRecipeExecutor.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SicPM.RecipeExecutions +namespace SicModules.PMs.RecipeExecutions { public interface IRecipeExecutor { diff --git a/Modules/Mainframe/PMs/Support/RecipeExecutions/PostProcess.cs b/Modules/Mainframe/PMs/RecipeExecutions/PostProcess.cs similarity index 98% rename from Modules/Mainframe/PMs/Support/RecipeExecutions/PostProcess.cs rename to Modules/Mainframe/PMs/RecipeExecutions/PostProcess.cs index b84f54b..526c9ed 100644 --- a/Modules/Mainframe/PMs/Support/RecipeExecutions/PostProcess.cs +++ b/Modules/Mainframe/PMs/RecipeExecutions/PostProcess.cs @@ -1,19 +1,15 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using System.Reflection; using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; -using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Aitex.Core.Util; using MECF.Framework.Common.Equipment; -using SicPM.Routines; +using SicModules.PMs.Routines.Base; -namespace SicPM.RecipeExecutions +namespace SicModules.PMs.RecipeExecutions { public class PostProcess : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/RecipeExecutions/PreProcess.cs b/Modules/Mainframe/PMs/RecipeExecutions/PreProcess.cs similarity index 99% rename from Modules/Mainframe/PMs/Support/RecipeExecutions/PreProcess.cs rename to Modules/Mainframe/PMs/RecipeExecutions/PreProcess.cs index 13aa228..2a384e7 100644 --- a/Modules/Mainframe/PMs/Support/RecipeExecutions/PreProcess.cs +++ b/Modules/Mainframe/PMs/RecipeExecutions/PreProcess.cs @@ -11,13 +11,12 @@ using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Device.Bases; using MECF.Framework.Common.Equipment; -using MECF.Framework.Common.OperationCenter; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.PMs; -using SicPM.Routines; -using static SicPM.PMModule; +using SicModules.PMs.Routines; +using SicModules.PMs.Routines.Base; -namespace SicPM.RecipeExecutions +namespace SicModules.PMs.RecipeExecutions { public class PreProcess : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/RecipeExecutions/Process.cs b/Modules/Mainframe/PMs/RecipeExecutions/Process.cs similarity index 99% rename from Modules/Mainframe/PMs/Support/RecipeExecutions/Process.cs rename to Modules/Mainframe/PMs/RecipeExecutions/Process.cs index f98ef69..cef4060 100644 --- a/Modules/Mainframe/PMs/Support/RecipeExecutions/Process.cs +++ b/Modules/Mainframe/PMs/RecipeExecutions/Process.cs @@ -1,4 +1,6 @@ -using Aitex.Core.Common; +using System; +using System.Collections.Generic; +using Aitex.Core.Common; using Aitex.Core.RT.DataCenter; using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; @@ -11,15 +13,11 @@ using Aitex.Core.RT.Tolerance; using Aitex.Core.Util; using MECF.Framework.Common.DBCore; using MECF.Framework.Common.Equipment; -using MECF.Framework.Common.OperationCenter; using MECF.Framework.Common.SubstrateTrackings; -using SicPM.Routines; -using System; -using System.Collections.Generic; -using System.Xml; +using SicModules.PMs.Routines.Base; using static Aitex.Core.RT.Device.PmDevices.DicMode; -namespace SicPM.RecipeExecutions +namespace SicModules.PMs.RecipeExecutions { public enum RecipeContinueMode { diff --git a/Modules/Mainframe/PMs/Support/RecipeExecutions/ProcessCalculate.cs b/Modules/Mainframe/PMs/RecipeExecutions/ProcessCalculate.cs similarity index 98% rename from Modules/Mainframe/PMs/Support/RecipeExecutions/ProcessCalculate.cs rename to Modules/Mainframe/PMs/RecipeExecutions/ProcessCalculate.cs index ca226ac..b988e27 100644 --- a/Modules/Mainframe/PMs/Support/RecipeExecutions/ProcessCalculate.cs +++ b/Modules/Mainframe/PMs/RecipeExecutions/ProcessCalculate.cs @@ -1,12 +1,10 @@ -using Aitex.Core.UI.ControlDataContext; -using MECF.Framework.Common.DBCore; -using System; +using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; +using Aitex.Core.UI.ControlDataContext; +using MECF.Framework.Common.DBCore; -namespace SicPM.RecipeExecutions +namespace SicModules.PMs.RecipeExecutions { public partial class Process { diff --git a/Modules/Mainframe/PMs/Support/RecipeExecutions/RecipeDBCallback.cs b/Modules/Mainframe/PMs/RecipeExecutions/RecipeDBCallback.cs similarity index 90% rename from Modules/Mainframe/PMs/Support/RecipeExecutions/RecipeDBCallback.cs rename to Modules/Mainframe/PMs/RecipeExecutions/RecipeDBCallback.cs index 22cbbad..1fbd879 100644 --- a/Modules/Mainframe/PMs/Support/RecipeExecutions/RecipeDBCallback.cs +++ b/Modules/Mainframe/PMs/RecipeExecutions/RecipeDBCallback.cs @@ -1,14 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using MECF.Framework.Common.CommonData; using MECF.Framework.Common.DBCore; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; -namespace SicPM.RecipeExecutions +namespace SicModules.PMs.RecipeExecutions { class RecipeDBCallback : IRecipeDBCallback { diff --git a/Modules/Mainframe/PMs/Support/RecipeExecutions/RecipeEndDataItem.cs b/Modules/Mainframe/PMs/RecipeExecutions/RecipeEndDataItem.cs similarity index 92% rename from Modules/Mainframe/PMs/Support/RecipeExecutions/RecipeEndDataItem.cs rename to Modules/Mainframe/PMs/RecipeExecutions/RecipeEndDataItem.cs index a437b5a..ae48c9d 100644 --- a/Modules/Mainframe/PMs/Support/RecipeExecutions/RecipeEndDataItem.cs +++ b/Modules/Mainframe/PMs/RecipeExecutions/RecipeEndDataItem.cs @@ -1,9 +1,9 @@ -using Aitex.Core.UI.ControlDataContext; -using System; +using System; using System.Collections.Generic; using System.Linq; +using Aitex.Core.UI.ControlDataContext; -namespace SicPM.RecipeExecutions +namespace SicModules.PMs.RecipeExecutions { public class RecipeEndDataItem { diff --git a/Modules/Mainframe/PMs/Support/RecipeExecutions/RecipeHead.cs b/Modules/Mainframe/PMs/RecipeExecutions/RecipeHead.cs similarity index 81% rename from Modules/Mainframe/PMs/Support/RecipeExecutions/RecipeHead.cs rename to Modules/Mainframe/PMs/RecipeExecutions/RecipeHead.cs index 203743f..fa7ba2a 100644 --- a/Modules/Mainframe/PMs/Support/RecipeExecutions/RecipeHead.cs +++ b/Modules/Mainframe/PMs/RecipeExecutions/RecipeHead.cs @@ -1,4 +1,4 @@ -namespace SicPM.RecipeExecutions +namespace SicModules.PMs.RecipeExecutions { public class RecipeHead { diff --git a/Modules/Mainframe/PMs/Support/RecipeExecutions/RecipeParser.cs b/Modules/Mainframe/PMs/RecipeExecutions/RecipeParser.cs similarity index 99% rename from Modules/Mainframe/PMs/Support/RecipeExecutions/RecipeParser.cs rename to Modules/Mainframe/PMs/RecipeExecutions/RecipeParser.cs index 4b95bee..04f271e 100644 --- a/Modules/Mainframe/PMs/Support/RecipeExecutions/RecipeParser.cs +++ b/Modules/Mainframe/PMs/RecipeExecutions/RecipeParser.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.IO; using System.Text.RegularExpressions; using System.Xml; using Aitex.Common.Util; @@ -9,7 +8,7 @@ using Aitex.Core.RT.RecipeCenter; using Aitex.Core.RT.SCCore; using static Aitex.Core.RT.Device.PmDevices.DicMode; -namespace SicPM.RecipeExecutions +namespace SicModules.PMs.RecipeExecutions { public class RecipeDataColumn { diff --git a/Modules/Mainframe/PMs/Support/RecipeExecutions/RecipeRunningInfo.cs b/Modules/Mainframe/PMs/RecipeExecutions/RecipeRunningInfo.cs similarity index 96% rename from Modules/Mainframe/PMs/Support/RecipeExecutions/RecipeRunningInfo.cs rename to Modules/Mainframe/PMs/RecipeExecutions/RecipeRunningInfo.cs index 913b205..8c8d94c 100644 --- a/Modules/Mainframe/PMs/Support/RecipeExecutions/RecipeRunningInfo.cs +++ b/Modules/Mainframe/PMs/RecipeExecutions/RecipeRunningInfo.cs @@ -1,8 +1,7 @@ using System; using System.Collections.Generic; - -namespace SicPM.RecipeExecutions +namespace SicModules.PMs.RecipeExecutions { public enum EnumRecipeRunningState { diff --git a/Modules/Mainframe/PMs/Support/RecipeExecutions/RecipeStep.cs b/Modules/Mainframe/PMs/RecipeExecutions/RecipeStep.cs similarity index 94% rename from Modules/Mainframe/PMs/Support/RecipeExecutions/RecipeStep.cs rename to Modules/Mainframe/PMs/RecipeExecutions/RecipeStep.cs index f434ff1..e8e33e1 100644 --- a/Modules/Mainframe/PMs/Support/RecipeExecutions/RecipeStep.cs +++ b/Modules/Mainframe/PMs/RecipeExecutions/RecipeStep.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace SicPM.RecipeExecutions +namespace SicModules.PMs.RecipeExecutions { public enum EnumEndByCondition { diff --git a/Modules/Mainframe/PMs/Support/RecipeExecutions/SicRecipeFileContext.cs b/Modules/Mainframe/PMs/RecipeExecutions/SicRecipeFileContext.cs similarity index 96% rename from Modules/Mainframe/PMs/Support/RecipeExecutions/SicRecipeFileContext.cs rename to Modules/Mainframe/PMs/RecipeExecutions/SicRecipeFileContext.cs index df509b6..b669e20 100644 --- a/Modules/Mainframe/PMs/Support/RecipeExecutions/SicRecipeFileContext.cs +++ b/Modules/Mainframe/PMs/RecipeExecutions/SicRecipeFileContext.cs @@ -1,17 +1,13 @@ -using Aitex.Common.Util; +using System; +using System.Collections.Generic; +using System.IO; +using System.Xml; +using Aitex.Common.Util; using Aitex.Core.RT.Event; using Aitex.Core.RT.Log; using Aitex.Core.RT.RecipeCenter; -using Aitex.Core.RT.SCCore; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml; -namespace SicPM.RecipeExecutions +namespace SicModules.PMs.RecipeExecutions { public class SicRecipeFileContext : IRecipeFileContext { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMBaseRoutine.cs b/Modules/Mainframe/PMs/Routines/Base/PMBaseRoutine.cs similarity index 99% rename from Modules/Mainframe/PMs/Support/Routines/PMBaseRoutine.cs rename to Modules/Mainframe/PMs/Routines/Base/PMBaseRoutine.cs index 83f8b5a..3ae99c5 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMBaseRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/Base/PMBaseRoutine.cs @@ -2,12 +2,11 @@ using System.Collections.Generic; using Aitex.Core.Common.DeviceData; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Routine; using MECF.Framework.Common.Equipment; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.PMs; -namespace SicPM.Routines +namespace SicModules.PMs.Routines.Base { public class PMBaseRoutine : ModuleRoutine, IRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMButttomSectionMoveRoutine.cs b/Modules/Mainframe/PMs/Routines/PMButttomSectionMoveRoutine.cs similarity index 97% rename from Modules/Mainframe/PMs/Support/Routines/PMButttomSectionMoveRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMButttomSectionMoveRoutine.cs index 34e51ea..4cc6677 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMButttomSectionMoveRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMButttomSectionMoveRoutine.cs @@ -1,16 +1,11 @@ using System; using System.Diagnostics; -using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Event; -using Aitex.Core.RT.IOCore; -using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; -using Aitex.Core.RT.SCCore; -using MECF.Framework.Common.DataCenter; using MECF.Framework.Common.Equipment; +using SicModules.PMs.Routines.Base; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { public class PMButttomSectionMoveRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMChamberMoveBodyRoutine.cs b/Modules/Mainframe/PMs/Routines/PMChamberMoveBodyRoutine.cs similarity index 99% rename from Modules/Mainframe/PMs/Support/Routines/PMChamberMoveBodyRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMChamberMoveBodyRoutine.cs index 97563a5..d1be3c7 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMChamberMoveBodyRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMChamberMoveBodyRoutine.cs @@ -3,14 +3,11 @@ using System.Diagnostics; using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; using Aitex.Core.RT.Event; -using Aitex.Core.RT.IOCore; -using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; -using Aitex.Core.RT.SCCore; -using MECF.Framework.Common.DataCenter; using MECF.Framework.Common.Equipment; +using SicModules.PMs.Routines.Base; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { public class PMChamberMoveBodyRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMCleanRoutine.cs b/Modules/Mainframe/PMs/Routines/PMCleanRoutine.cs similarity index 98% rename from Modules/Mainframe/PMs/Support/Routines/PMCleanRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMCleanRoutine.cs index ccdc202..ea98b05 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMCleanRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMCleanRoutine.cs @@ -1,17 +1,14 @@ -using Aitex.Core.RT.Device; +using System.Collections.Generic; +using System.Diagnostics; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; -using Aitex.Core.RT.IOCore; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadPorts.TDK; -using System; -using System.Collections.Generic; -using System.Diagnostics; +using SicModules.PMs.Routines.Base; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { public class PMCleanRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMExchangeMoRoutine.cs b/Modules/Mainframe/PMs/Routines/PMExchangeMoRoutine.cs similarity index 98% rename from Modules/Mainframe/PMs/Support/Routines/PMExchangeMoRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMExchangeMoRoutine.cs index ae16b01..bb14692 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMExchangeMoRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMExchangeMoRoutine.cs @@ -1,15 +1,15 @@ -using Aitex.Core.RT.Device; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using System; -using System.Collections.Generic; -using System.Diagnostics; +using SicModules.PMs.Routines.Base; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { public class PMExchangeMoRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMHomeRoutine.cs b/Modules/Mainframe/PMs/Routines/PMHomeRoutine.cs similarity index 97% rename from Modules/Mainframe/PMs/Support/Routines/PMHomeRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMHomeRoutine.cs index 0bec249..26c7d64 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMHomeRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMHomeRoutine.cs @@ -1,11 +1,11 @@ using System; -using Aitex.Core.RT.Device; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.PMs; +using SicModules.PMs.Routines.Base; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { public class PMHomeRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMLeakCheckRoutine.cs b/Modules/Mainframe/PMs/Routines/PMLeakCheckRoutine.cs similarity index 99% rename from Modules/Mainframe/PMs/Support/Routines/PMLeakCheckRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMLeakCheckRoutine.cs index 4906140..c993243 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMLeakCheckRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMLeakCheckRoutine.cs @@ -1,16 +1,16 @@ -using Aitex.Core.RT.Device; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.DBCore; using MECF.Framework.Common.Equipment; -using System; -using System.Collections.Generic; -using System.Diagnostics; +using SicModules.PMs.Routines.Base; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { public class PMLeakCheckRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMPcCalibrationRoutine.cs b/Modules/Mainframe/PMs/Routines/PMPcCalibrationRoutine.cs similarity index 98% rename from Modules/Mainframe/PMs/Support/Routines/PMPcCalibrationRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMPcCalibrationRoutine.cs index 79a1f8e..2042364 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMPcCalibrationRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMPcCalibrationRoutine.cs @@ -2,17 +2,11 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using Aitex.Core.RT.Device; -using Aitex.Core.RT.Event; -using Aitex.Core.RT.IOCore; -using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; -using Aitex.Core.RT.SCCore; -using MECF.Framework.Common.DataCenter; using MECF.Framework.Common.Equipment; +using SicModules.PMs.Routines.Base; - -namespace SicPM.Routines +namespace SicModules.PMs.Routines { public class PMPcCalibrationRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMPostTransferRoutine.cs b/Modules/Mainframe/PMs/Routines/PMPostTransferRoutine.cs similarity index 97% rename from Modules/Mainframe/PMs/Support/Routines/PMPostTransferRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMPostTransferRoutine.cs index 3caaf7c..8cb9bca 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMPostTransferRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMPostTransferRoutine.cs @@ -1,18 +1,11 @@ -using Aitex.Core.RT.Device; -using Aitex.Core.RT.Event; +using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Servo.NAIS; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using static SicPM.PMModule; +using SicModules.PMs.Routines.Base; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { class PMPostTransferRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMPrepareTransferRoutine.cs b/Modules/Mainframe/PMs/Routines/PMPrepareTransferRoutine.cs similarity index 98% rename from Modules/Mainframe/PMs/Support/Routines/PMPrepareTransferRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMPrepareTransferRoutine.cs index 61ecb77..f122fa6 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMPrepareTransferRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMPrepareTransferRoutine.cs @@ -1,20 +1,16 @@ -using Aitex.Core.Common.DeviceData; +using System; using Aitex.Core.RT.Device; +using Aitex.Core.RT.Device.Devices; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Servo.NAIS; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.PMs; -using static SicPM.PMModule; -using Aitex.Core.RT.Device.Devices; +using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Servo.NAIS; +using SicModules.PMs.Routines.Base; +using static SicModules.PMs.PMModule; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { class PMPrepareTransferRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMProcessAbortRoutine.cs b/Modules/Mainframe/PMs/Routines/PMProcessAbortRoutine.cs similarity index 98% rename from Modules/Mainframe/PMs/Support/Routines/PMProcessAbortRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMProcessAbortRoutine.cs index 1669229..ee787fe 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMProcessAbortRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMProcessAbortRoutine.cs @@ -1,14 +1,13 @@ -using Aitex.Core.RT.Device; -using Aitex.Core.RT.Device.Unit; +using System; +using System.Collections.Generic; +using System.Diagnostics; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using System; -using System.Collections.Generic; -using System.Diagnostics; +using SicModules.PMs.Routines.Base; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { public class PMProcessAbortRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMProcessRoutine.cs b/Modules/Mainframe/PMs/Routines/PMProcessRoutine.cs similarity index 99% rename from Modules/Mainframe/PMs/Support/Routines/PMProcessRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMProcessRoutine.cs index d5d8b9c..2baa4b8 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMProcessRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMProcessRoutine.cs @@ -10,7 +10,7 @@ using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.PMs; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { public class PMProcessRoutine : ModuleRoutine, IRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMPumpRoutine.cs b/Modules/Mainframe/PMs/Routines/PMPumpRoutine.cs similarity index 98% rename from Modules/Mainframe/PMs/Support/Routines/PMPumpRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMPumpRoutine.cs index 5852bc5..1b60e7e 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMPumpRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMPumpRoutine.cs @@ -1,14 +1,14 @@ -using Aitex.Core.RT.Device; +using System.Collections.Generic; +using System.Diagnostics; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using System.Collections.Generic; -using System.Diagnostics; +using SicModules.PMs.Routines.Base; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { public class PMPumpRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMPurgeRoutine.cs b/Modules/Mainframe/PMs/Routines/PMPurgeRoutine.cs similarity index 99% rename from Modules/Mainframe/PMs/Support/Routines/PMPurgeRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMPurgeRoutine.cs index c567401..0e91da6 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMPurgeRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMPurgeRoutine.cs @@ -1,15 +1,14 @@ -using Aitex.Core.RT.Device; +using System.Collections.Generic; +using System.Diagnostics; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using System; -using System.Collections.Generic; -using System.Diagnostics; +using SicModules.PMs.Routines.Base; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { public class PMPurgeRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMServoToPressure.cs b/Modules/Mainframe/PMs/Routines/PMServoToPressure.cs similarity index 97% rename from Modules/Mainframe/PMs/Support/Routines/PMServoToPressure.cs rename to Modules/Mainframe/PMs/Routines/PMServoToPressure.cs index b9b2088..8110f2b 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMServoToPressure.cs +++ b/Modules/Mainframe/PMs/Routines/PMServoToPressure.cs @@ -1,13 +1,12 @@ -using Aitex.Core.RT.Device; +using System; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; -using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using System; +using SicModules.PMs.Routines.Base; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { public class PMServoToPressure : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMStopHeatEnableRoutine.cs b/Modules/Mainframe/PMs/Routines/PMStopHeatEnableRoutine.cs similarity index 89% rename from Modules/Mainframe/PMs/Support/Routines/PMStopHeatEnableRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMStopHeatEnableRoutine.cs index 0ff6cd1..508a82f 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMStopHeatEnableRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMStopHeatEnableRoutine.cs @@ -1,10 +1,8 @@ -using Aitex.Core.RT.Device; -using Aitex.Core.RT.Event; -using Aitex.Core.RT.Routine; -using Aitex.Core.RT.SCCore; +using Aitex.Core.RT.Routine; using MECF.Framework.Common.Equipment; +using SicModules.PMs.Routines.Base; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { public class PMStopHeatEnableRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMToAtmIdleRoutine.cs b/Modules/Mainframe/PMs/Routines/PMToAtmIdleRoutine.cs similarity index 98% rename from Modules/Mainframe/PMs/Support/Routines/PMToAtmIdleRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMToAtmIdleRoutine.cs index e7c2fd1..a76472f 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMToAtmIdleRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMToAtmIdleRoutine.cs @@ -1,15 +1,14 @@ -using Aitex.Core.RT.Device; +using System.Collections.Generic; +using System.Diagnostics; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using System; -using System.Collections.Generic; -using System.Diagnostics; +using SicModules.PMs.Routines.Base; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { public class PMToAtmIdleRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMToIsolationRoutine.cs b/Modules/Mainframe/PMs/Routines/PMToIsolationRoutine.cs similarity index 97% rename from Modules/Mainframe/PMs/Support/Routines/PMToIsolationRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMToIsolationRoutine.cs index 5cbcec8..92b598c 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMToIsolationRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMToIsolationRoutine.cs @@ -1,13 +1,11 @@ -using Aitex.Core.RT.Device; +using System.Collections.Generic; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Routine; -using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using System; -using System.Collections.Generic; +using SicModules.PMs.Routines.Base; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { public class PMToIsolationRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMToProcessIdleRoutine.cs b/Modules/Mainframe/PMs/Routines/PMToProcessIdleRoutine.cs similarity index 99% rename from Modules/Mainframe/PMs/Support/Routines/PMToProcessIdleRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMToProcessIdleRoutine.cs index f41cd2b..ee84e32 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMToProcessIdleRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMToProcessIdleRoutine.cs @@ -1,14 +1,14 @@ -using Aitex.Core.RT.Device; +using System.Collections.Generic; +using System.Diagnostics; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using System.Collections.Generic; -using System.Diagnostics; +using SicModules.PMs.Routines.Base; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { public class PMToProcessIdleRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMVacIdleRoutine.cs b/Modules/Mainframe/PMs/Routines/PMVacIdleRoutine.cs similarity index 98% rename from Modules/Mainframe/PMs/Support/Routines/PMVacIdleRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMVacIdleRoutine.cs index 7d12219..c9d5cb0 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMVacIdleRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMVacIdleRoutine.cs @@ -1,14 +1,14 @@ -using Aitex.Core.RT.Device; +using System.Collections.Generic; +using System.Diagnostics; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using System.Collections.Generic; -using System.Diagnostics; +using SicModules.PMs.Routines.Base; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { public class PMVacIdleRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/Routines/PMVentRoutine.cs b/Modules/Mainframe/PMs/Routines/PMVentRoutine.cs similarity index 98% rename from Modules/Mainframe/PMs/Support/Routines/PMVentRoutine.cs rename to Modules/Mainframe/PMs/Routines/PMVentRoutine.cs index a07529c..6747d81 100644 --- a/Modules/Mainframe/PMs/Support/Routines/PMVentRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/PMVentRoutine.cs @@ -1,14 +1,14 @@ -using Aitex.Core.RT.Device; +using System.Collections.Generic; +using System.Diagnostics; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using System.Collections.Generic; -using System.Diagnostics; +using SicModules.PMs.Routines.Base; -namespace SicPM.Routines +namespace SicModules.PMs.Routines { public class PMVentRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/RecipeRoutine/PMMacroRoutine.cs b/Modules/Mainframe/PMs/Routines/Recipe/PMMacroRoutine.cs similarity index 99% rename from Modules/Mainframe/PMs/Support/RecipeRoutine/PMMacroRoutine.cs rename to Modules/Mainframe/PMs/Routines/Recipe/PMMacroRoutine.cs index 22354e7..24f232e 100644 --- a/Modules/Mainframe/PMs/Support/RecipeRoutine/PMMacroRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/Recipe/PMMacroRoutine.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using Aitex.Core.Common; using Aitex.Core.Common.DeviceData; using Aitex.Core.RT.Device; @@ -13,10 +12,10 @@ using Aitex.Core.RT.SCCore; using Aitex.Core.Util; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; -using SicPM.RecipeExecutions; -using SicPM.Routines; +using SicModules.PMs.RecipeExecutions; +using SicModules.PMs.Routines.Base; -namespace SicPM.RecipeRoutine +namespace SicModules.PMs.Routines.Recipe { public enum RecipeContinueMode { diff --git a/Modules/Mainframe/PMs/Support/RecipeRoutine/PostPMMacroRoutine.cs b/Modules/Mainframe/PMs/Routines/Recipe/PostPMMacroRoutine.cs similarity index 71% rename from Modules/Mainframe/PMs/Support/RecipeRoutine/PostPMMacroRoutine.cs rename to Modules/Mainframe/PMs/Routines/Recipe/PostPMMacroRoutine.cs index 2873c27..696b8f5 100644 --- a/Modules/Mainframe/PMs/Support/RecipeRoutine/PostPMMacroRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/Recipe/PostPMMacroRoutine.cs @@ -1,16 +1,8 @@ -using System; -using Aitex.Core.RT.Device; -using Aitex.Core.RT.Event; -using Aitex.Core.RT.Routine; -using Aitex.Core.RT.SCCore; +using Aitex.Core.RT.Routine; using MECF.Framework.Common.Equipment; -using MECF.Framework.Common.Schedulers; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.PMs; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; -using SicPM.Routines; +using SicModules.PMs.Routines.Base; -namespace SicPM.RecipeRoutine +namespace SicModules.PMs.Routines.Recipe { public class PostPMMacroRoutine : PMBaseRoutine { diff --git a/Modules/Mainframe/PMs/Support/RecipeRoutine/PrePMMacroRoutine.cs b/Modules/Mainframe/PMs/Routines/Recipe/PrePMMacroRoutine.cs similarity index 97% rename from Modules/Mainframe/PMs/Support/RecipeRoutine/PrePMMacroRoutine.cs rename to Modules/Mainframe/PMs/Routines/Recipe/PrePMMacroRoutine.cs index 3ab8dbb..fd9e94c 100644 --- a/Modules/Mainframe/PMs/Support/RecipeRoutine/PrePMMacroRoutine.cs +++ b/Modules/Mainframe/PMs/Routines/Recipe/PrePMMacroRoutine.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Aitex.Core.Common; -using Aitex.Core.Common.DeviceData; using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; using Aitex.Core.RT.Event; @@ -9,16 +8,12 @@ using Aitex.Core.RT.Log; using Aitex.Core.RT.OperationCenter; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using MECF.Framework.Common.Device.Bases; using MECF.Framework.Common.Equipment; -using MECF.Framework.Common.Schedulers; using MECF.Framework.Common.SubstrateTrackings; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.PMs; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; -using SicPM.Routines; +using SicModules.PMs.Routines.Base; -namespace SicPM.RecipeRoutine +namespace SicModules.PMs.Routines.Recipe { public class PrePMMacroRoutine : PMBaseRoutine { @@ -108,7 +103,7 @@ namespace SicPM.RecipeRoutine return Result.FAIL; } - //Recipe Routineȴ򿪼 + //Recipe Routine先打开加热 PmDevice.SetHeatEnable(true); @@ -195,7 +190,7 @@ namespace SicPM.RecipeRoutine //if (_isSlitDoorOpened) //ExecuteRoutine((int)Routine.CloseSlitValve, _closeSlitValveRoutine); - //رз + //关闭所有阀门 // CloseAllValves((int)Routine.CloseAllVavle, 10); //if (!_isATMMode) @@ -274,7 +269,7 @@ namespace SicPM.RecipeRoutine string reason = string.Empty; - //ִйճ + //执行工艺程序命令 foreach (var recipeCmd in PmDevice.RecipeRunningInfo.RecipeStepList[0].RecipeCommands.Keys) { if (recipeCmd == "SusHeaterSetMode") diff --git a/Modules/Mainframe/PMs/Support/RecipeRoutine/RecipeParser.cs b/Modules/Mainframe/PMs/Routines/Recipe/RecipeParser.cs similarity index 98% rename from Modules/Mainframe/PMs/Support/RecipeRoutine/RecipeParser.cs rename to Modules/Mainframe/PMs/Routines/Recipe/RecipeParser.cs index 923a028..086f29b 100644 --- a/Modules/Mainframe/PMs/Support/RecipeRoutine/RecipeParser.cs +++ b/Modules/Mainframe/PMs/Routines/Recipe/RecipeParser.cs @@ -1,18 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Xml; using Aitex.Common.Util; using Aitex.Core.Common.DeviceData; using Aitex.Core.RT.Log; using Aitex.Core.RT.RecipeCenter; using Aitex.Core.RT.SCCore; -using SicPM.RecipeExecutions; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml; +using SicModules.PMs.RecipeExecutions; using static Aitex.Core.RT.Device.PmDevices.DicMode; -namespace SicPM.RecipeRoutine +namespace SicModules.PMs.Routines.Recipe { public class RecipeParser { diff --git a/Modules/Mainframe/PMs/Support/Utilities/UnitAlarmItem.cs b/Modules/Mainframe/PMs/Utilities/UnitAlarmItem.cs similarity index 72% rename from Modules/Mainframe/PMs/Support/Utilities/UnitAlarmItem.cs rename to Modules/Mainframe/PMs/Utilities/UnitAlarmItem.cs index 9980c4b..94f360c 100644 --- a/Modules/Mainframe/PMs/Support/Utilities/UnitAlarmItem.cs +++ b/Modules/Mainframe/PMs/Utilities/UnitAlarmItem.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SicPM.Utilities +namespace SicModules.PMs.Utilities { public class UnitAlarmItem { diff --git a/Modules/Mainframe/PMs/Support/Utilities/XmlConfig.cs b/Modules/Mainframe/PMs/Utilities/XmlConfig.cs similarity index 85% rename from Modules/Mainframe/PMs/Support/Utilities/XmlConfig.cs rename to Modules/Mainframe/PMs/Utilities/XmlConfig.cs index cf04e10..45b157c 100644 --- a/Modules/Mainframe/PMs/Support/Utilities/XmlConfig.cs +++ b/Modules/Mainframe/PMs/Utilities/XmlConfig.cs @@ -1,14 +1,9 @@ -using Aitex.Common.Util; -using MECF.Framework.Common.Equipment; -using System; -using System.Collections.Generic; -using System.IO; +using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Xml.Linq; +using Aitex.Common.Util; -namespace SicPM.Utilities +namespace SicModules.PMs.Utilities { public static class XmlConfig { diff --git a/Modules/Mainframe/Mainframe.csproj b/Modules/Mainframe/SicModules.csproj similarity index 52% rename from Modules/Mainframe/Mainframe.csproj rename to Modules/Mainframe/SicModules.csproj index 27e8495..c781867 100644 --- a/Modules/Mainframe/Mainframe.csproj +++ b/Modules/Mainframe/SicModules.csproj @@ -7,8 +7,8 @@ {424E9610-FA50-49CD-B5BE-BAF256DBF327} Library Properties - Mainframe - Mainframe + SicModules + SicModules v4.8 512 true @@ -77,16 +77,16 @@ - - - + + + - - + + @@ -98,128 +98,128 @@ - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - @@ -272,7 +272,9 @@ Always - + + + diff --git a/Modules/Mainframe/TMs/TMBaseRoutine.cs b/Modules/Mainframe/TMs/Routines/Base/TMBaseRoutine.cs similarity index 99% rename from Modules/Mainframe/TMs/TMBaseRoutine.cs rename to Modules/Mainframe/TMs/Routines/Base/TMBaseRoutine.cs index 4eb4ff6..23d3063 100644 --- a/Modules/Mainframe/TMs/TMBaseRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/Base/TMBaseRoutine.cs @@ -7,7 +7,6 @@ using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Mainframe.Devices; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Schedulers; using MECF.Framework.Common.SubstrateTrackings; @@ -16,8 +15,9 @@ using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.PMs; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.RobotBase; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; +using IoInterLock = SicModules.Devices.IoInterLock; -namespace Mainframe.TMs +namespace SicModules.TMs.Routines.Base { public class TMBaseRoutine : ModuleRoutine, IRoutine { @@ -53,7 +53,7 @@ namespace Mainframe.TMs protected IoSensor SensorBufferHighWaferPresence = null; protected IoSensor SensorBufferMiddleWaferPresence = null; protected IoSensor SensorBufferLowWaferPresence = null; - private Mainframe.Devices.IoInterLock _tmIoInterLock; + private IoInterLock _tmIoInterLock; //传盘后PM腔检查Tray是否放好Sensor public IoSensor _reactorSuspectorCheckPM1; public IoSensor _reactorSuspectorCheckPM2; @@ -73,7 +73,7 @@ namespace Mainframe.TMs SensorBufferMiddleWaferPresence = DEVICE.GetDevice($"{ModuleName.TM}.BufferWaferMiddle"); SensorBufferLowWaferPresence = DEVICE.GetDevice($"{ModuleName.TM}.BufferWaferLow"); - _tmIoInterLock = DEVICE.GetDevice("TM.IoInterLock"); + _tmIoInterLock = DEVICE.GetDevice("TM.IoInterLock"); _loadLift = DEVICE.GetDevice($"{ModuleName.LoadLock}.LLLift"); _unLoadLift = DEVICE.GetDevice($"{ModuleName.UnLoad}.UnLoadLift"); diff --git a/Modules/Mainframe/TMs/TMHomeRoutine.cs b/Modules/Mainframe/TMs/Routines/TMHomeRoutine.cs similarity index 91% rename from Modules/Mainframe/TMs/TMHomeRoutine.cs rename to Modules/Mainframe/TMs/Routines/TMHomeRoutine.cs index 7bda1b6..bdd74d6 100644 --- a/Modules/Mainframe/TMs/TMHomeRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMHomeRoutine.cs @@ -1,13 +1,9 @@ using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using SicModules.TMs.Routines.Base; -namespace Mainframe.TMs +namespace SicModules.TMs.Routines { public class TMHomeRoutine : TMBaseRoutine { diff --git a/Modules/Mainframe/TMs/TMLeakcheckRoutine.cs b/Modules/Mainframe/TMs/Routines/TMLeakcheckRoutine.cs similarity index 98% rename from Modules/Mainframe/TMs/TMLeakcheckRoutine.cs rename to Modules/Mainframe/TMs/Routines/TMLeakcheckRoutine.cs index 5ab7247..9a7a9e7 100644 --- a/Modules/Mainframe/TMs/TMLeakcheckRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMLeakcheckRoutine.cs @@ -2,19 +2,17 @@ using System.Diagnostics; using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; -using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Mainframe.Devices; -using Mainframe.LLs; using MECF.Framework.Common.DBCore; using MECF.Framework.Common.Equipment; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; +using SicModules.LLs; +using IoInterLock = SicModules.Devices.IoInterLock; -namespace Mainframe.TMs +namespace SicModules.TMs.Routines { public class TMLeakCheckRoutine : ModuleRoutine, IRoutine { @@ -62,7 +60,7 @@ namespace Mainframe.TMs private Devices.IoPump _pumpType; private LoadLock _ll; private IoSensor _preHeatLid; - private Mainframe.Devices.IoInterLock _tmIoInterLock; + private IoInterLock _tmIoInterLock; private Stopwatch _swTimer = new Stopwatch(); public int ElapsedTime @@ -78,7 +76,7 @@ namespace Mainframe.TMs _tmLid = DEVICE.GetDevice($"TM.TMLidClosed"); _pumpType = DEVICE.GetDevice($"TM.TMPump1"); _preHeatLid = DEVICE.GetDevice($"TM.PreHeatStationLidClosed"); - _tmIoInterLock = DEVICE.GetDevice("TM.IoInterLock"); + _tmIoInterLock = DEVICE.GetDevice("TM.IoInterLock"); _pumpRoutine = new TMPumpRoutine(); _ventRoutine = new TMVentRoutine(); diff --git a/Modules/Mainframe/TMs/TMPressureBalancePidRoutine.cs b/Modules/Mainframe/TMs/Routines/TMPressureBalancePidRoutine.cs similarity index 99% rename from Modules/Mainframe/TMs/TMPressureBalancePidRoutine.cs rename to Modules/Mainframe/TMs/Routines/TMPressureBalancePidRoutine.cs index 4340af0..14b3d75 100644 --- a/Modules/Mainframe/TMs/TMPressureBalancePidRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMPressureBalancePidRoutine.cs @@ -1,20 +1,18 @@ -using Aitex.Core.RT.Device; +using System; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using Aitex.Core.Util; using MECF.Framework.Common.Equipment; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; +using SicModules.TMs.Routines.Base; -namespace Mainframe.TMs +namespace SicModules.TMs.Routines { public class TMPressureBalancePidRoutine : TMBaseRoutine { diff --git a/Modules/Mainframe/TMs/TMPressureBalanceRoutine.cs b/Modules/Mainframe/TMs/Routines/TMPressureBalanceRoutine.cs similarity index 99% rename from Modules/Mainframe/TMs/TMPressureBalanceRoutine.cs rename to Modules/Mainframe/TMs/Routines/TMPressureBalanceRoutine.cs index 5e2d134..9855d6e 100644 --- a/Modules/Mainframe/TMs/TMPressureBalanceRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMPressureBalanceRoutine.cs @@ -1,12 +1,12 @@ using System; using Aitex.Core.RT.Device; -using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; +using SicModules.TMs.Routines.Base; -namespace Mainframe.TMs +namespace SicModules.TMs.Routines { public class TMPressureBalanceRoutine : TMBaseRoutine { diff --git a/Modules/Mainframe/TMs/TMPumpRoutine.cs b/Modules/Mainframe/TMs/Routines/TMPumpRoutine.cs similarity index 96% rename from Modules/Mainframe/TMs/TMPumpRoutine.cs rename to Modules/Mainframe/TMs/Routines/TMPumpRoutine.cs index 034e4c0..7c7bdd1 100644 --- a/Modules/Mainframe/TMs/TMPumpRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMPumpRoutine.cs @@ -1,18 +1,16 @@ -using System; -using System.Diagnostics; +using System.Diagnostics; using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Mainframe.Devices; -using Mainframe.LLs; using MECF.Framework.Common.Equipment; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; +using SicModules.LLs; +using SicModules.TMs.Routines.Base; +using IoInterLock = SicModules.Devices.IoInterLock; -namespace Mainframe.TMs +namespace SicModules.TMs.Routines { public class TMPumpRoutine : TMBaseRoutine { @@ -40,7 +38,7 @@ namespace Mainframe.TMs private IoSensor _tmLid; private Devices.IoPump _pumpType; private LoadLock _ll; - private Mainframe.Devices.IoInterLock _tmIoInterLock; + private IoInterLock _tmIoInterLock; private double _forelineBasePressure; private double _pumpBasePressure; @@ -66,7 +64,7 @@ namespace Mainframe.TMs _bufferLid = DEVICE.GetDevice($"Buffer.BufferLidClosed"); _tmLid = DEVICE.GetDevice($"TM.TMLidClosed"); _pumpType = DEVICE.GetDevice($"TM.TMPump1"); - _tmIoInterLock = DEVICE.GetDevice("TM.IoInterLock"); + _tmIoInterLock = DEVICE.GetDevice("TM.IoInterLock"); } public void Init() diff --git a/Modules/Mainframe/TMs/TMPurgeRoutine.cs b/Modules/Mainframe/TMs/Routines/TMPurgeRoutine.cs similarity index 96% rename from Modules/Mainframe/TMs/TMPurgeRoutine.cs rename to Modules/Mainframe/TMs/Routines/TMPurgeRoutine.cs index 3f99a13..fd542b1 100644 --- a/Modules/Mainframe/TMs/TMPurgeRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMPurgeRoutine.cs @@ -1,18 +1,17 @@ -using System; -using System.Diagnostics; +using System.Diagnostics; using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Mainframe.Devices; -using Mainframe.LLs; using MECF.Framework.Common.Equipment; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; +using SicModules.LLs; +using SicModules.TMs.Routines.Base; +using IoInterLock = SicModules.Devices.IoInterLock; -namespace Mainframe.TMs +namespace SicModules.TMs.Routines { public class TMPurgeRoutine : TMBaseRoutine { @@ -51,7 +50,7 @@ namespace Mainframe.TMs private IoSensor _tmLid; private Devices.IoPump _pumpType; private LoadLock _ll; - private Mainframe.Devices.IoInterLock _tmIoInterLock; + private IoInterLock _tmIoInterLock; private Stopwatch _swTimer = new Stopwatch(); private int _routineTimeOut; @@ -86,7 +85,7 @@ namespace Mainframe.TMs _bufferLid = DEVICE.GetDevice($"Buffer.BufferLidClosed"); _tmLid = DEVICE.GetDevice($"TM.TMLidClosed"); _pumpType = DEVICE.GetDevice($"TM.TMPump1"); - _tmIoInterLock = DEVICE.GetDevice("TM.IoInterLock"); + _tmIoInterLock = DEVICE.GetDevice("TM.IoInterLock"); _mfc60 = DEVICE.GetDevice($"TM.Mfc60"); //_pumpRoutine = new TMPumpRoutine(); diff --git a/Modules/Mainframe/TMs/TMRobotExtendRoutine.cs b/Modules/Mainframe/TMs/Routines/TMRobotExtendRoutine.cs similarity index 93% rename from Modules/Mainframe/TMs/TMRobotExtendRoutine.cs rename to Modules/Mainframe/TMs/Routines/TMRobotExtendRoutine.cs index 30bf511..69811bb 100644 --- a/Modules/Mainframe/TMs/TMRobotExtendRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMRobotExtendRoutine.cs @@ -1,18 +1,15 @@ -using System; -using Aitex.Core.RT.Device; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using Aitex.Sorter.Common; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Schedulers; -using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.PMs; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robot; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; +using SicModules.TMs.Routines.Base; -namespace Mainframe.TMs +namespace SicModules.TMs.Routines { public class TMRobotExtendRoutine : TMBaseRoutine { diff --git a/Modules/Mainframe/TMs/TMRobotGoToRoutine.cs b/Modules/Mainframe/TMs/Routines/TMRobotGoToRoutine.cs similarity index 95% rename from Modules/Mainframe/TMs/TMRobotGoToRoutine.cs rename to Modules/Mainframe/TMs/Routines/TMRobotGoToRoutine.cs index f44fe52..b966afd 100644 --- a/Modules/Mainframe/TMs/TMRobotGoToRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMRobotGoToRoutine.cs @@ -1,19 +1,15 @@ -using Aitex.Core.RT.Event; +using System; +using System.Collections.Generic; +using Aitex.Core.RT.Event; using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Aitex.Sorter.Common; using MECF.Framework.Common.Equipment; -using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.RobotBase; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using SicModules.TMs.Routines.Base; -namespace Mainframe.TMs +namespace SicModules.TMs.Routines { public class TMRobotGotoRoutine : TMBaseRoutine { diff --git a/Modules/Mainframe/TMs/TMRobotHomeRoutine.cs b/Modules/Mainframe/TMs/Routines/TMRobotHomeRoutine.cs similarity index 96% rename from Modules/Mainframe/TMs/TMRobotHomeRoutine.cs rename to Modules/Mainframe/TMs/Routines/TMRobotHomeRoutine.cs index eb7ef70..73b07d4 100644 --- a/Modules/Mainframe/TMs/TMRobotHomeRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMRobotHomeRoutine.cs @@ -1,19 +1,15 @@ using System; using System.Collections.Generic; -using Aitex.Core.RT.Device; using Aitex.Core.RT.Event; using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Aitex.Sorter.Common; -using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robot; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.RobotBase; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.Siasun1500C800C; +using SicModules.TMs.Routines.Base; -namespace Mainframe.TMs +namespace SicModules.TMs.Routines { public class TMRobotHomeRoutine : TMBaseRoutine { diff --git a/Modules/Mainframe/TMs/TMRobotPickAndPlaceRoutine.cs b/Modules/Mainframe/TMs/Routines/TMRobotPickAndPlaceRoutine.cs similarity index 94% rename from Modules/Mainframe/TMs/TMRobotPickAndPlaceRoutine.cs rename to Modules/Mainframe/TMs/Routines/TMRobotPickAndPlaceRoutine.cs index 8a811df..eb4f03d 100644 --- a/Modules/Mainframe/TMs/TMRobotPickAndPlaceRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMRobotPickAndPlaceRoutine.cs @@ -1,17 +1,12 @@ -using System; -using Aitex.Core.RT.Device; -using Aitex.Core.RT.Event; +using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Aitex.Core.Util; using Aitex.Sorter.Common; using MECF.Framework.Common.Equipment; -using MECF.Framework.Common.Schedulers; using MECF.Framework.Common.SubstrateTrackings; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.PMs; +using SicModules.TMs.Routines.Base; -namespace Mainframe.TMs +namespace SicModules.TMs.Routines { public class TMRobotPickAndPlaceRoutine : TMBaseRoutine { diff --git a/Modules/Mainframe/TMs/TMRobotPickRoutine.cs b/Modules/Mainframe/TMs/Routines/TMRobotPickRoutine.cs similarity index 97% rename from Modules/Mainframe/TMs/TMRobotPickRoutine.cs rename to Modules/Mainframe/TMs/Routines/TMRobotPickRoutine.cs index 906907f..c9df377 100644 --- a/Modules/Mainframe/TMs/TMRobotPickRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMRobotPickRoutine.cs @@ -1,20 +1,14 @@ -using System; -using Aitex.Core.RT.Device; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Event; using Aitex.Core.RT.Log; -using Aitex.Core.RT.OperationCenter; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Aitex.Sorter.Common; -using Mainframe.Devices; using MECF.Framework.Common.Equipment; -using MECF.Framework.Common.Schedulers; using MECF.Framework.Common.SubstrateTrackings; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.PMs; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots; +using SicModules.TMs.Routines.Base; -namespace Mainframe.TMs +namespace SicModules.TMs.Routines { public class TMRobotPickRoutine : TMBaseRoutine { diff --git a/Modules/Mainframe/TMs/TMRobotPlaceRoutine.cs b/Modules/Mainframe/TMs/Routines/TMRobotPlaceRoutine.cs similarity index 99% rename from Modules/Mainframe/TMs/TMRobotPlaceRoutine.cs rename to Modules/Mainframe/TMs/Routines/TMRobotPlaceRoutine.cs index 8c7755d..f72469e 100644 --- a/Modules/Mainframe/TMs/TMRobotPlaceRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMRobotPlaceRoutine.cs @@ -1,14 +1,15 @@ using Aitex.Core.RT.Device; using Aitex.Core.RT.Event; +using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots; -using Aitex.Core.RT.Log; -using Mainframe.LLs; +using SicModules.LLs.Routines; +using SicModules.TMs.Routines.Base; -namespace Mainframe.TMs +namespace SicModules.TMs.Routines { public class TMRobotPlaceRoutine : TMBaseRoutine { diff --git a/Modules/Mainframe/TMs/TMRobotRetractRoutine.cs b/Modules/Mainframe/TMs/Routines/TMRobotRetractRoutine.cs similarity index 94% rename from Modules/Mainframe/TMs/TMRobotRetractRoutine.cs rename to Modules/Mainframe/TMs/Routines/TMRobotRetractRoutine.cs index 1258698..5c8df96 100644 --- a/Modules/Mainframe/TMs/TMRobotRetractRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMRobotRetractRoutine.cs @@ -1,5 +1,4 @@ -using System; -using Aitex.Core.RT.Device; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; @@ -8,10 +7,9 @@ using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Schedulers; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.PMs; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robot; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; +using SicModules.TMs.Routines.Base; -namespace Mainframe.TMs +namespace SicModules.TMs.Routines { public class TMRobotRetractRoutine : TMBaseRoutine { diff --git a/Modules/Mainframe/TMs/TMServoRoutine.cs b/Modules/Mainframe/TMs/Routines/TMServoRoutine.cs similarity index 93% rename from Modules/Mainframe/TMs/TMServoRoutine.cs rename to Modules/Mainframe/TMs/Routines/TMServoRoutine.cs index 31b764c..b721e22 100644 --- a/Modules/Mainframe/TMs/TMServoRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMServoRoutine.cs @@ -2,16 +2,10 @@ using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Mainframe.LLs; using MECF.Framework.Common.Equipment; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using SicModules.TMs.Routines.Base; -namespace Mainframe.TMs +namespace SicModules.TMs.Routines { public class TMServoRoutine : TMBaseRoutine { diff --git a/Modules/Mainframe/TMs/TMSlitValveRoutine.cs b/Modules/Mainframe/TMs/Routines/TMSlitValveRoutine.cs similarity index 99% rename from Modules/Mainframe/TMs/TMSlitValveRoutine.cs rename to Modules/Mainframe/TMs/Routines/TMSlitValveRoutine.cs index 702ff30..affcc0a 100644 --- a/Modules/Mainframe/TMs/TMSlitValveRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMSlitValveRoutine.cs @@ -2,21 +2,22 @@ using Aitex.Core.RT.DataCenter; using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.OperationCenter; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Mainframe.LLs; -using Mainframe.UnLoads; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Servo.NAIS; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.UnLoad; +using SicModules.LLs; +using SicModules.LLs.Routines; +using SicModules.TMs.Routines.Base; +using SicModules.UnLoads; +using SicModules.UnLoads.Routines; -namespace Mainframe.TMs +namespace SicModules.TMs.Routines { public class TMSlitValveRoutine : TMBaseRoutine { diff --git a/Modules/Mainframe/TMs/TMVentRoutine.cs b/Modules/Mainframe/TMs/Routines/TMVentRoutine.cs similarity index 95% rename from Modules/Mainframe/TMs/TMVentRoutine.cs rename to Modules/Mainframe/TMs/Routines/TMVentRoutine.cs index 90c0253..bd77606 100644 --- a/Modules/Mainframe/TMs/TMVentRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMVentRoutine.cs @@ -1,19 +1,17 @@ -using System; -using System.Diagnostics; +using System.Diagnostics; using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; -using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Mainframe.Devices; -using Mainframe.LLs; using MECF.Framework.Common.Equipment; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Temps.P116PIDTC; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; +using SicModules.LLs; +using SicModules.TMs.Routines.Base; +using IoInterLock = SicModules.Devices.IoInterLock; -namespace Mainframe.TMs +namespace SicModules.TMs.Routines { public class TMVentRoutine : TMBaseRoutine { @@ -59,7 +57,7 @@ namespace Mainframe.TMs private LoadLock _ll; private IoSensor _preHeatLid; private IoMFC _mfc60; - private Mainframe.Devices.IoInterLock _tmIoInterLock; + private IoInterLock _tmIoInterLock; private P116PIDTC _p116PIDTC; private double _mfc60Default1; @@ -77,7 +75,7 @@ namespace Mainframe.TMs _pumpType = DEVICE.GetDevice($"TM.TMPump1"); _preHeatLid = DEVICE.GetDevice($"TM.PreHeatStationLidClosed"); _mfc60 = DEVICE.GetDevice($"TM.Mfc60"); - _tmIoInterLock = DEVICE.GetDevice("TM.IoInterLock"); + _tmIoInterLock = DEVICE.GetDevice("TM.IoInterLock"); _p116PIDTC = DEVICE.GetDevice("TM.P116PIDTC"); } diff --git a/Modules/Mainframe/TMs/TMVerifySlitValveRoutine.cs b/Modules/Mainframe/TMs/Routines/TMVerifySlitValveRoutine.cs similarity index 99% rename from Modules/Mainframe/TMs/TMVerifySlitValveRoutine.cs rename to Modules/Mainframe/TMs/Routines/TMVerifySlitValveRoutine.cs index 34fa693..db20a57 100644 --- a/Modules/Mainframe/TMs/TMVerifySlitValveRoutine.cs +++ b/Modules/Mainframe/TMs/Routines/TMVerifySlitValveRoutine.cs @@ -9,7 +9,7 @@ using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.PMs; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; -namespace Mainframe.TMs +namespace SicModules.TMs.Routines { public class TMVerifySlitValveRoutine : ModuleRoutine, IRoutine { diff --git a/Modules/Mainframe/TMs/SicTM.cs b/Modules/Mainframe/TMs/SicTM.cs index 8dace92..18b1a6e 100644 --- a/Modules/Mainframe/TMs/SicTM.cs +++ b/Modules/Mainframe/TMs/SicTM.cs @@ -1,23 +1,18 @@ -using Aitex.Core.RT.Device; +using System; +using System.Collections.Generic; +using System.Xml; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Event; using Aitex.Core.RT.IOCore; using Aitex.Core.RT.SCCore; using Aitex.Core.Util; -using Mainframe.Devices; -using MECF.Framework.Common.Device.Bases; using MECF.Framework.Common.Equipment; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; -using SicPM.Utilities; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml; +using IoInterLock = SicModules.Devices.IoInterLock; -namespace Mainframe.TMs +namespace SicModules.TMs { public class SicTM : TM { @@ -43,7 +38,7 @@ namespace Mainframe.TMs private IoPressureMeter3 _pm2Pressure2; - private Mainframe.Devices.IoInterLock _tmIoInterLock; + private IoInterLock _tmIoInterLock; private Aitex.Core.RT.Device.Devices.IoInterLock _pm1InterLock; private Aitex.Core.RT.Device.Devices.IoInterLock _pm2InterLock; @@ -155,7 +150,7 @@ namespace Mainframe.TMs _tmMfc = DEVICE.GetDevice("TM.Mfc60"); - _tmIoInterLock = DEVICE.GetDevice("TM.IoInterLock"); + _tmIoInterLock = DEVICE.GetDevice("TM.IoInterLock"); _pm1InterLock = DEVICE.GetDevice("PM1.PMInterLock"); _pm2InterLock = DEVICE.GetDevice("PM2.PMInterLock"); diff --git a/Modules/Mainframe/TMs/SicTMRobot.cs b/Modules/Mainframe/TMs/SicTMRobot.cs index 06869e7..2a9700c 100644 --- a/Modules/Mainframe/TMs/SicTMRobot.cs +++ b/Modules/Mainframe/TMs/SicTMRobot.cs @@ -1,9 +1,9 @@ -using Aitex.Core.RT.SCCore; +using System.Xml; +using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.SiasunPhoenixB; -using System.Xml; -namespace Mainframe.TMs +namespace SicModules.TMs { public class SicTMRobot : RobotSiasunPhoenixB { diff --git a/Modules/Mainframe/TMs/TMModule.cs b/Modules/Mainframe/TMs/TMModule.cs index 7b5cd3d..95787ec 100644 --- a/Modules/Mainframe/TMs/TMModule.cs +++ b/Modules/Mainframe/TMs/TMModule.cs @@ -1,4 +1,10 @@ -using Aitex.Core.RT.DataCenter; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Threading; +using System.Threading.Tasks; +using Aitex.Core.RT.DataCenter; using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; using Aitex.Core.RT.Device.Unit; @@ -7,25 +13,15 @@ using Aitex.Core.RT.Fsm; using Aitex.Core.RT.OperationCenter; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Aitex.Core.Util; using Aitex.Core.Utilities; using Aitex.Sorter.Common; -using Mainframe.Devices; -using MECF.Framework.Common.Device.Bases; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Event; using MECF.Framework.Common.PLC; -using MECF.Framework.Common.Schedulers; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using SicAds = Mainframe.Devices.SicAds; +using SicModules.TMs.Routines; +using SicAds = SicModules.Devices.SicAds; -namespace Mainframe.TMs +namespace SicModules.TMs { public class TMModule : TMModuleBase { diff --git a/Modules/Mainframe/TMs/TMModuleBase.cs b/Modules/Mainframe/TMs/TMModuleBase.cs index 2919aa1..a3d1280 100644 --- a/Modules/Mainframe/TMs/TMModuleBase.cs +++ b/Modules/Mainframe/TMs/TMModuleBase.cs @@ -5,7 +5,7 @@ using MECF.Framework.Common.Fsm; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.LogicUnits; -namespace Mainframe.TMs +namespace SicModules.TMs { public abstract class TMModuleBase : ModuleFsmDevice, ITransferRobot, IModuleDevice { diff --git a/Modules/Mainframe/UnLoads/UnLoadBaseRoutine.cs b/Modules/Mainframe/UnLoads/Routines/Base/UnLoadBaseRoutine.cs similarity index 98% rename from Modules/Mainframe/UnLoads/UnLoadBaseRoutine.cs rename to Modules/Mainframe/UnLoads/Routines/Base/UnLoadBaseRoutine.cs index 6beb6ff..1a45f98 100644 --- a/Modules/Mainframe/UnLoads/UnLoadBaseRoutine.cs +++ b/Modules/Mainframe/UnLoads/Routines/Base/UnLoadBaseRoutine.cs @@ -1,17 +1,16 @@ -using Aitex.Core.RT.Device; +using System; +using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Routine; -using Mainframe.Devices; -using Mainframe.EFEMs; -using Mainframe.TMs; using MECF.Framework.Common.Equipment; -using MECF.Framework.RT.EquipmentLibrary.Core; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.EFEM; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.UnLoad; -using System; +using SicModules.Devices; +using SicModules.EFEMs; +using SicModules.TMs; -namespace Mainframe.UnLoads +namespace SicModules.UnLoads.Routines.Base { public class UnLoadBaseRoutine : ModuleRoutine, IRoutine { diff --git a/Modules/Mainframe/UnLoads/UnLoadClawRoutine.cs b/Modules/Mainframe/UnLoads/Routines/UnLoadClawRoutine.cs similarity index 87% rename from Modules/Mainframe/UnLoads/UnLoadClawRoutine.cs rename to Modules/Mainframe/UnLoads/Routines/UnLoadClawRoutine.cs index 1d4197f..7f525b9 100644 --- a/Modules/Mainframe/UnLoads/UnLoadClawRoutine.cs +++ b/Modules/Mainframe/UnLoads/Routines/UnLoadClawRoutine.cs @@ -1,14 +1,9 @@ -using Aitex.Core.RT.Device; -using Aitex.Core.RT.Device.Unit; +using Aitex.Core.RT.Device.Unit; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using SicModules.UnLoads.Routines.Base; -namespace Mainframe.UnLoads +namespace SicModules.UnLoads.Routines { public class UnLoadClawRoutine : UnLoadBaseRoutine { diff --git a/Modules/Mainframe/UnLoads/UnLoadCoolingAndPurgeRoutine.cs b/Modules/Mainframe/UnLoads/Routines/UnLoadCoolingAndPurgeRoutine.cs similarity index 97% rename from Modules/Mainframe/UnLoads/UnLoadCoolingAndPurgeRoutine.cs rename to Modules/Mainframe/UnLoads/Routines/UnLoadCoolingAndPurgeRoutine.cs index eb61925..7e12718 100644 --- a/Modules/Mainframe/UnLoads/UnLoadCoolingAndPurgeRoutine.cs +++ b/Modules/Mainframe/UnLoads/Routines/UnLoadCoolingAndPurgeRoutine.cs @@ -1,16 +1,12 @@ -using Aitex.Core.RT.Event; +using System.Diagnostics; +using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using Aitex.Core.Util; using MECF.Framework.Common.Equipment; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using SicModules.UnLoads.Routines.Base; -namespace Mainframe.UnLoads +namespace SicModules.UnLoads.Routines { public class UnLoadCoolingAndPurgeRoutine : UnLoadBaseRoutine { diff --git a/Modules/Mainframe/UnLoads/UnLoadCoolingRoutine.cs b/Modules/Mainframe/UnLoads/Routines/UnLoadCoolingRoutine.cs similarity index 88% rename from Modules/Mainframe/UnLoads/UnLoadCoolingRoutine.cs rename to Modules/Mainframe/UnLoads/Routines/UnLoadCoolingRoutine.cs index d60dfe9..a5aa96b 100644 --- a/Modules/Mainframe/UnLoads/UnLoadCoolingRoutine.cs +++ b/Modules/Mainframe/UnLoads/Routines/UnLoadCoolingRoutine.cs @@ -1,12 +1,8 @@ -using Aitex.Core.RT.Device; -using Aitex.Core.RT.Device.Unit; -using Aitex.Core.RT.Routine; -using Aitex.Core.RT.SCCore; +using Aitex.Core.RT.Routine; using Aitex.Core.Util; -using MECF.Framework.Common.Equipment; -using System; +using SicModules.UnLoads.Routines.Base; -namespace Mainframe.UnLoads +namespace SicModules.UnLoads.Routines { public class UnLoadCoolingRoutine : UnLoadBaseRoutine { diff --git a/Modules/Mainframe/UnLoads/UnLoadHomeRoutine.cs b/Modules/Mainframe/UnLoads/Routines/UnLoadHomeRoutine.cs similarity index 95% rename from Modules/Mainframe/UnLoads/UnLoadHomeRoutine.cs rename to Modules/Mainframe/UnLoads/Routines/UnLoadHomeRoutine.cs index 259a3bd..3148752 100644 --- a/Modules/Mainframe/UnLoads/UnLoadHomeRoutine.cs +++ b/Modules/Mainframe/UnLoads/Routines/UnLoadHomeRoutine.cs @@ -1,14 +1,11 @@ -using Aitex.Core.RT.Log; +using System; +using Aitex.Core.RT.Log; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using SicModules.UnLoads.Routines.Base; -namespace Mainframe.UnLoads +namespace SicModules.UnLoads.Routines { public class UnLoadHomeRoutine : UnLoadBaseRoutine { diff --git a/Modules/Mainframe/UnLoads/UnLoadLeakCheckRoutine.cs b/Modules/Mainframe/UnLoads/Routines/UnLoadLeakCheckRoutine.cs similarity index 98% rename from Modules/Mainframe/UnLoads/UnLoadLeakCheckRoutine.cs rename to Modules/Mainframe/UnLoads/Routines/UnLoadLeakCheckRoutine.cs index 241ca78..1746804 100644 --- a/Modules/Mainframe/UnLoads/UnLoadLeakCheckRoutine.cs +++ b/Modules/Mainframe/UnLoads/Routines/UnLoadLeakCheckRoutine.cs @@ -1,12 +1,13 @@ -using Aitex.Core.RT.Event; +using System; +using System.Diagnostics; +using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.DBCore; using MECF.Framework.Common.Equipment; -using System; -using System.Diagnostics; +using SicModules.UnLoads.Routines.Base; -namespace Mainframe.UnLoads +namespace SicModules.UnLoads.Routines { public class UnLoadLeakCheckRoutine : UnLoadBaseRoutine { diff --git a/Modules/Mainframe/UnLoads/UnLoadLiftRoutine.cs b/Modules/Mainframe/UnLoads/Routines/UnLoadLiftRoutine.cs similarity index 85% rename from Modules/Mainframe/UnLoads/UnLoadLiftRoutine.cs rename to Modules/Mainframe/UnLoads/Routines/UnLoadLiftRoutine.cs index c23461a..8ca035e 100644 --- a/Modules/Mainframe/UnLoads/UnLoadLiftRoutine.cs +++ b/Modules/Mainframe/UnLoads/Routines/UnLoadLiftRoutine.cs @@ -1,12 +1,8 @@ -using Aitex.Core.RT.Device; -using Aitex.Core.RT.Device; -using Aitex.Core.RT.Device.Unit; -using Aitex.Core.RT.Routine; +using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using MECF.Framework.Common.Equipment; -using System; +using SicModules.UnLoads.Routines.Base; -namespace Mainframe.UnLoads +namespace SicModules.UnLoads.Routines { public class UnLoadLiftRoutine : UnLoadBaseRoutine { diff --git a/Modules/Mainframe/UnLoads/UnLoadPrepareTransferRoutine.cs b/Modules/Mainframe/UnLoads/Routines/UnLoadPrepareTransferRoutine.cs similarity index 98% rename from Modules/Mainframe/UnLoads/UnLoadPrepareTransferRoutine.cs rename to Modules/Mainframe/UnLoads/Routines/UnLoadPrepareTransferRoutine.cs index de7f6e8..ab4b8f7 100644 --- a/Modules/Mainframe/UnLoads/UnLoadPrepareTransferRoutine.cs +++ b/Modules/Mainframe/UnLoads/Routines/UnLoadPrepareTransferRoutine.cs @@ -2,11 +2,9 @@ using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using System; -using System.Diagnostics; +using SicModules.UnLoads.Routines.Base; - -namespace Mainframe.UnLoads +namespace SicModules.UnLoads.Routines { public class UnLoadPrepareTransferRoutine : UnLoadBaseRoutine { diff --git a/Modules/Mainframe/UnLoads/UnLoadPumpRoutine.cs b/Modules/Mainframe/UnLoads/Routines/UnLoadPumpRoutine.cs similarity index 97% rename from Modules/Mainframe/UnLoads/UnLoadPumpRoutine.cs rename to Modules/Mainframe/UnLoads/Routines/UnLoadPumpRoutine.cs index a996825..f7312ac 100644 --- a/Modules/Mainframe/UnLoads/UnLoadPumpRoutine.cs +++ b/Modules/Mainframe/UnLoads/Routines/UnLoadPumpRoutine.cs @@ -1,10 +1,11 @@ -using Aitex.Core.RT.Event; +using System.Diagnostics; +using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using System.Diagnostics; +using SicModules.UnLoads.Routines.Base; -namespace Mainframe.UnLoads +namespace SicModules.UnLoads.Routines { public class UnLoadPumpRoutine : UnLoadBaseRoutine { diff --git a/Modules/Mainframe/UnLoads/UnLoadPurgeRoutine.cs b/Modules/Mainframe/UnLoads/Routines/UnLoadPurgeRoutine.cs similarity index 97% rename from Modules/Mainframe/UnLoads/UnLoadPurgeRoutine.cs rename to Modules/Mainframe/UnLoads/Routines/UnLoadPurgeRoutine.cs index 04ac676..abd99b3 100644 --- a/Modules/Mainframe/UnLoads/UnLoadPurgeRoutine.cs +++ b/Modules/Mainframe/UnLoads/Routines/UnLoadPurgeRoutine.cs @@ -1,11 +1,11 @@ -using Aitex.Core.RT.Event; +using System.Diagnostics; +using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using System.Diagnostics; +using SicModules.UnLoads.Routines.Base; - -namespace Mainframe.UnLoads +namespace SicModules.UnLoads.Routines { public class UnLoadPurgeRoutine : UnLoadBaseRoutine { diff --git a/Modules/Mainframe/UnLoads/UnLoadSeparateRoutine.cs b/Modules/Mainframe/UnLoads/Routines/UnLoadSeparateRoutine.cs similarity index 93% rename from Modules/Mainframe/UnLoads/UnLoadSeparateRoutine.cs rename to Modules/Mainframe/UnLoads/Routines/UnLoadSeparateRoutine.cs index c820471..8088408 100644 --- a/Modules/Mainframe/UnLoads/UnLoadSeparateRoutine.cs +++ b/Modules/Mainframe/UnLoads/Routines/UnLoadSeparateRoutine.cs @@ -1,9 +1,8 @@ -using Aitex.Core.RT.Device; -using Aitex.Core.RT.Device.Unit; -using Aitex.Core.RT.Routine; +using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; +using SicModules.UnLoads.Routines.Base; -namespace Mainframe.UnLoads +namespace SicModules.UnLoads.Routines { public class UnLoadSeparateRoutine : UnLoadBaseRoutine { diff --git a/Modules/Mainframe/UnLoads/UnLoadServoToRoutine.cs b/Modules/Mainframe/UnLoads/Routines/UnLoadServoToRoutine.cs similarity index 95% rename from Modules/Mainframe/UnLoads/UnLoadServoToRoutine.cs rename to Modules/Mainframe/UnLoads/Routines/UnLoadServoToRoutine.cs index 8588724..101306e 100644 --- a/Modules/Mainframe/UnLoads/UnLoadServoToRoutine.cs +++ b/Modules/Mainframe/UnLoads/Routines/UnLoadServoToRoutine.cs @@ -1,15 +1,11 @@ using System; -using Aitex.Core.RT.Device; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using MECF.Framework.Common.Equipment; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.TMs; -using Mainframe.TMs; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.UnLoad; +using SicModules.UnLoads.Routines.Base; -namespace Mainframe.UnLoads +namespace SicModules.UnLoads.Routines { public class UnLoadServoToRoutine : UnLoadBaseRoutine { diff --git a/Modules/Mainframe/UnLoads/UnLoadVentRoutine.cs b/Modules/Mainframe/UnLoads/Routines/UnLoadVentRoutine.cs similarity index 97% rename from Modules/Mainframe/UnLoads/UnLoadVentRoutine.cs rename to Modules/Mainframe/UnLoads/Routines/UnLoadVentRoutine.cs index 3d35a5e..5f27e85 100644 --- a/Modules/Mainframe/UnLoads/UnLoadVentRoutine.cs +++ b/Modules/Mainframe/UnLoads/Routines/UnLoadVentRoutine.cs @@ -1,12 +1,11 @@ -using Aitex.Core.RT.Device; +using System.Diagnostics; using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; -using Mainframe.Devices; using MECF.Framework.Common.Equipment; -using System.Diagnostics; +using SicModules.UnLoads.Routines.Base; -namespace Mainframe.UnLoads +namespace SicModules.UnLoads.Routines { public class UnLoadVentRoutine : UnLoadBaseRoutine { diff --git a/Modules/Mainframe/UnLoads/SicUnLoad.cs b/Modules/Mainframe/UnLoads/SicUnLoad.cs index 6160b83..75c9bc6 100644 --- a/Modules/Mainframe/UnLoads/SicUnLoad.cs +++ b/Modules/Mainframe/UnLoads/SicUnLoad.cs @@ -1,24 +1,14 @@ -using Aitex.Core.Common; -using Aitex.Core.RT.DataCenter; +using System; +using System.Xml; using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; using Aitex.Core.RT.Device.Unit; -using Aitex.Core.RT.Event; -using Aitex.Core.RT.IOCore; -using Aitex.Core.RT.Log; -using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using Aitex.Core.Util; -using Aitex.Sorter.Common; -using MECF.Framework.Common.DataCenter; -using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Schedulers; -using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.UnLoad; -using System; -using System.Xml; -namespace Mainframe.UnLoads +namespace SicModules.UnLoads { public class SicUnLoad : UnLoad { diff --git a/Modules/Mainframe/UnLoads/UnLoadModule.cs b/Modules/Mainframe/UnLoads/UnLoadModule.cs index 6c618eb..5e728a8 100644 --- a/Modules/Mainframe/UnLoads/UnLoadModule.cs +++ b/Modules/Mainframe/UnLoads/UnLoadModule.cs @@ -1,4 +1,7 @@ -using Aitex.Core.RT.DataCenter; +using System; +using System.Threading; +using System.Threading.Tasks; +using Aitex.Core.RT.DataCenter; using Aitex.Core.RT.Device; using Aitex.Core.RT.Event; using Aitex.Core.RT.Fsm; @@ -8,14 +11,11 @@ using Aitex.Core.RT.SCCore; using Aitex.Core.Util; using Aitex.Core.Utilities; using Aitex.Sorter.Common; -using Mainframe.TMs; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Schedulers; -using System; -using System.Threading; -using System.Threading.Tasks; +using SicModules.UnLoads.Routines; -namespace Mainframe.UnLoads +namespace SicModules.UnLoads { public class UnLoadModule : UnLoadModuleBase { diff --git a/Modules/Mainframe/UnLoads/UnLoadModuleBase.cs b/Modules/Mainframe/UnLoads/UnLoadModuleBase.cs index 549ebdf..7e8c0da 100644 --- a/Modules/Mainframe/UnLoads/UnLoadModuleBase.cs +++ b/Modules/Mainframe/UnLoads/UnLoadModuleBase.cs @@ -6,7 +6,7 @@ using MECF.Framework.Common.Schedulers; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.LogicUnits; -namespace Mainframe.UnLoads +namespace SicModules.UnLoads { public abstract class UnLoadModuleBase : ModuleFsmDevice, ITransferTarget, IModuleDevice { diff --git a/Sic08.sln b/Sic08.sln index 0cffd82..78fb521 100644 --- a/Sic08.sln +++ b/Sic08.sln @@ -17,15 +17,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SicUI", "SicUI\SicUI.csproj {5EAFA05F-C2C0-40B3-9C8F-46D8559148D0} = {5EAFA05F-C2C0-40B3-9C8F-46D8559148D0} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sic_Setup", "SicSetup\Sic_Setup\Sic_Setup.csproj", "{C842F167-DB8E-4827-ACDD-74215AF5100A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SicSetup", "SicSetup\Sic_Setup\SicSetup.csproj", "{C842F167-DB8E-4827-ACDD-74215AF5100A}" ProjectSection(ProjectDependencies) = postProject {5EAFA05F-C2C0-40B3-9C8F-46D8559148D0} = {5EAFA05F-C2C0-40B3-9C8F-46D8559148D0} {290FE38F-45F9-408C-B25B-C899B467E3F8} = {290FE38F-45F9-408C-B25B-C899B467E3F8} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{7255FC3F-B9F1-407C-ACCD-C0D92618CFE7}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mainframe", "Modules\Mainframe\Mainframe.csproj", "{424E9610-FA50-49CD-B5BE-BAF256DBF327}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SicModules", "Modules\Mainframe\SicModules.csproj", "{424E9610-FA50-49CD-B5BE-BAF256DBF327}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -99,9 +97,6 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {424E9610-FA50-49CD-B5BE-BAF256DBF327} = {7255FC3F-B9F1-407C-ACCD-C0D92618CFE7} - EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {49F07864-CB9F-43CB-97F1-FED8C84760FE} EndGlobalSection diff --git a/SicRT/Config/IoProviderConfig.xml b/SicRT/Config/IoProviderConfig.xml index b563e4b..87eb6c2 100644 --- a/SicRT/Config/IoProviderConfig.xml +++ b/SicRT/Config/IoProviderConfig.xml @@ -52,7 +52,7 @@ - + diff --git a/SicRT/Equipments/HomeAll.cs b/SicRT/Equipments/HomeAll.cs index 94c6833..8e104c0 100644 --- a/SicRT/Equipments/HomeAll.cs +++ b/SicRT/Equipments/HomeAll.cs @@ -4,15 +4,15 @@ using Aitex.Core.RT.Event; using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using Aitex.Core.Util; -using Mainframe.Aligners; -using Mainframe.Buffers; -using Mainframe.Cassettes; -using Mainframe.EFEMs; -using Mainframe.LLs; -using Mainframe.TMs; -using Mainframe.UnLoads; using MECF.Framework.Common.Equipment; -using SicPM; +using SicModules.Aligners; +using SicModules.Buffers; +using SicModules.Cassettes; +using SicModules.EFEMs; +using SicModules.LLs; +using SicModules.PMs; +using SicModules.TMs; +using SicModules.UnLoads; using SicRT.Equipments.Systems; namespace SicRT.Modules diff --git a/SicRT/Equipments/ManualTransfer.cs b/SicRT/Equipments/ManualTransfer.cs index ba1f47b..e3b5cff 100644 --- a/SicRT/Equipments/ManualTransfer.cs +++ b/SicRT/Equipments/ManualTransfer.cs @@ -5,12 +5,10 @@ using Aitex.Core.RT.Routine; using Aitex.Core.RT.SCCore; using Aitex.Core.Util; using Aitex.Sorter.Common; -using Mainframe.Aligners; -using Mainframe.Buffers; -using Mainframe.TMs; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Schedulers; using MECF.Framework.Common.SubstrateTrackings; +using SicModules.Aligners.Routines; using SicRT.Modules.Schedulers; namespace SicRT.Equipments diff --git a/SicRT/Equipments/Schedulers/SchedulerAligner.cs b/SicRT/Equipments/Schedulers/SchedulerAligner.cs index a3bc21b..51ca9cf 100644 --- a/SicRT/Equipments/Schedulers/SchedulerAligner.cs +++ b/SicRT/Equipments/Schedulers/SchedulerAligner.cs @@ -5,9 +5,8 @@ using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; using SicRT.Equipments; using SicRT.Equipments.Systems; -using Mainframe.Buffers; using Aitex.Core.RT.Device; -using Mainframe.Aligners; +using SicModules.Aligners; namespace SicRT.Modules.Schedulers { diff --git a/SicRT/Equipments/Schedulers/SchedulerBuffer.cs b/SicRT/Equipments/Schedulers/SchedulerBuffer.cs index 33724d7..73cd795 100644 --- a/SicRT/Equipments/Schedulers/SchedulerBuffer.cs +++ b/SicRT/Equipments/Schedulers/SchedulerBuffer.cs @@ -5,9 +5,9 @@ using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; using SicRT.Equipments; using SicRT.Equipments.Systems; -using Mainframe.Buffers; using Aitex.Core.RT.Device; using Aitex.Core.RT.Device.Devices; +using SicModules.Buffers; namespace SicRT.Modules.Schedulers { diff --git a/SicRT/Equipments/Schedulers/SchedulerCassette.cs b/SicRT/Equipments/Schedulers/SchedulerCassette.cs index 548b5d9..4042c31 100644 --- a/SicRT/Equipments/Schedulers/SchedulerCassette.cs +++ b/SicRT/Equipments/Schedulers/SchedulerCassette.cs @@ -3,9 +3,9 @@ using Aitex.Core.Util; using SicRT.Scheduler; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; +using SicModules.Cassettes; using SicRT.Equipments; using SicRT.Equipments.Systems; -using Mainframe.Cassettes; namespace SicRT.Modules.Schedulers { diff --git a/SicRT/Equipments/Schedulers/SchedulerLoadLock.cs b/SicRT/Equipments/Schedulers/SchedulerLoadLock.cs index 38c5a01..56cb001 100644 --- a/SicRT/Equipments/Schedulers/SchedulerLoadLock.cs +++ b/SicRT/Equipments/Schedulers/SchedulerLoadLock.cs @@ -12,11 +12,11 @@ using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Schedulers; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadLocks; -using Mainframe.LLs; using SicRT.Equipments; using SicRT.Equipments.Systems; using SicRT.Modules.Schedulers; using MECF.Framework.Common.Device.Bases; +using SicModules.LLs; namespace SicRT.Scheduler { diff --git a/SicRT/Equipments/Schedulers/SchedulerTMRobot.cs b/SicRT/Equipments/Schedulers/SchedulerTMRobot.cs index 6e6141f..a4c515f 100644 --- a/SicRT/Equipments/Schedulers/SchedulerTMRobot.cs +++ b/SicRT/Equipments/Schedulers/SchedulerTMRobot.cs @@ -10,8 +10,8 @@ using SicRT.Modules.Schedulers; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; using SicRT.Equipments.Systems; -using Mainframe.TMs; using Aitex.Core.RT.Fsm; +using SicModules.TMs; namespace SicRT.Scheduler { diff --git a/SicRT/Equipments/Schedulers/SchedulerTrayRobot.cs b/SicRT/Equipments/Schedulers/SchedulerTrayRobot.cs index 516d3e8..e7f0c3f 100644 --- a/SicRT/Equipments/Schedulers/SchedulerTrayRobot.cs +++ b/SicRT/Equipments/Schedulers/SchedulerTrayRobot.cs @@ -3,8 +3,8 @@ using Aitex.Sorter.Common; using SicRT.Modules.Schedulers; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; +using SicModules.EFEMs; using SicRT.Equipments.Systems; -using Mainframe.EFEMs; namespace SicRT.Scheduler { diff --git a/SicRT/Equipments/Schedulers/SchedulerUnLoad.cs b/SicRT/Equipments/Schedulers/SchedulerUnLoad.cs index ed84df7..342a17f 100644 --- a/SicRT/Equipments/Schedulers/SchedulerUnLoad.cs +++ b/SicRT/Equipments/Schedulers/SchedulerUnLoad.cs @@ -7,12 +7,12 @@ using Aitex.Sorter.Common; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Schedulers; using MECF.Framework.Common.SubstrateTrackings; -using Mainframe.LLs; using SicRT.Equipments.Systems; using SicRT.Modules.Schedulers; -using Mainframe.UnLoads; using System.Diagnostics; using Aitex.Core.RT.Event; +using SicModules.LLs; +using SicModules.UnLoads; namespace SicRT.Scheduler { diff --git a/SicRT/Equipments/Schedulers/SchedulerWaferRobot.cs b/SicRT/Equipments/Schedulers/SchedulerWaferRobot.cs index f088b5b..0071e60 100644 --- a/SicRT/Equipments/Schedulers/SchedulerWaferRobot.cs +++ b/SicRT/Equipments/Schedulers/SchedulerWaferRobot.cs @@ -3,8 +3,8 @@ using Aitex.Sorter.Common; using SicRT.Modules.Schedulers; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.SubstrateTrackings; +using SicModules.EFEMs; using SicRT.Equipments.Systems; -using Mainframe.EFEMs; namespace SicRT.Scheduler { diff --git a/SicRT/Equipments/Systems/DeviceManager.cs b/SicRT/Equipments/Systems/DeviceManager.cs index 10ddb10..a497189 100644 --- a/SicRT/Equipments/Systems/DeviceManager.cs +++ b/SicRT/Equipments/Systems/DeviceManager.cs @@ -1,11 +1,7 @@ using Aitex.Core.RT.Device; using Aitex.Core.RT.SCCore; -using Mainframe.Devices; -using MECF.Framework.Common.Device.Bases; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Breakers.NSXCOM; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Servo.NAIS; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Temps.AE; -using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Temps.Omron; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.UPS; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.MachineVision.Keyence; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Aligners.HwAligner; diff --git a/SicRT/Equipments/Systems/EquipmentManager.cs b/SicRT/Equipments/Systems/EquipmentManager.cs index 259d24b..1377ea2 100644 --- a/SicRT/Equipments/Systems/EquipmentManager.cs +++ b/SicRT/Equipments/Systems/EquipmentManager.cs @@ -13,24 +13,23 @@ using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Fsm; using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.Core.IoProviders; -using Mainframe.Buffers; -using Mainframe.LLs; -using Mainframe.TMs; using SicRT.Instances; using SicRT.Modules; using System.Linq; using System.Threading.Tasks; using Aitex.Core.RT.Device.Unit; -using Mainframe.Aligners; -using Mainframe.UnLoads; -using Mainframe.EFEMs; -using Mainframe.Cassettes; using Aitex.Core.RT.SCCore; -using SicPM; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.UPS; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Temps.AE; using Aitex.Core.RT.Device.Devices; -using MECF.Framework.RT.EquipmentLibrary.Devices; +using SicModules.Aligners; +using SicModules.Buffers; +using SicModules.Cassettes; +using SicModules.EFEMs; +using SicModules.LLs; +using SicModules.PMs; +using SicModules.TMs; +using SicModules.UnLoads; namespace SicRT.Equipments.Systems { @@ -164,7 +163,7 @@ namespace SicRT.Equipments.Systems private IoInterLock _pm1InterLock = null; private IoInterLock _pm2InterLock = null; - private Mainframe.Devices.IoInterLock _tmInterLock = null; + private SicModules.Devices.IoInterLock _tmInterLock = null; private IoSlitValve _pm1SlitValve = null; private IoSlitValve _pm2SlitValve = null; private PeriodicJob _thread; @@ -286,7 +285,7 @@ namespace SicRT.Equipments.Systems _pm1InterLock = DEVICE.GetDevice("PM1.PMInterLock"); _pm2InterLock = DEVICE.GetDevice("PM2.PMInterLock"); - _tmInterLock = DEVICE.GetDevice("TM.IoInterLock"); + _tmInterLock = DEVICE.GetDevice("TM.IoInterLock"); _upsPM1A = DEVICE.GetDevice("PM1.ITAUPSA"); _upsPM1B = DEVICE.GetDevice("PM1.ITAUPSB"); diff --git a/SicRT/Instances/ToolLoader.cs b/SicRT/Instances/ToolLoader.cs index d668e54..a70686b 100644 --- a/SicRT/Instances/ToolLoader.cs +++ b/SicRT/Instances/ToolLoader.cs @@ -18,9 +18,9 @@ using MECF.Framework.Common.SubstrateTrackings; using MECF.Framework.RT.Core.Applications; using MECF.Framework.RT.Core.Backend; using MECF.Framework.RT.Core.IoProviders; +using SicModules.PMs.RecipeExecutions; using SorterRT.Modules; using SicRT.Equipments.Systems; -using SicPM.RecipeExecutions; namespace SicRT.Instances { diff --git a/SicRT/SicRT.csproj b/SicRT/SicRT.csproj index 0794a1f..ac6c725 100644 --- a/SicRT/SicRT.csproj +++ b/SicRT/SicRT.csproj @@ -197,12 +197,6 @@ Always - - - {424e9610-fa50-49cd-b5be-baf256dbf327} - Mainframe - - False @@ -231,6 +225,12 @@ Always + + + {424e9610-fa50-49cd-b5be-baf256dbf327} + SicModules + + diff --git a/SicSetup/Sic_Setup/Sic_Setup.csproj b/SicSetup/Sic_Setup/SicSetup.csproj similarity index 99% rename from SicSetup/Sic_Setup/Sic_Setup.csproj rename to SicSetup/Sic_Setup/SicSetup.csproj index 1c435ff..f8818e1 100644 --- a/SicSetup/Sic_Setup/Sic_Setup.csproj +++ b/SicSetup/Sic_Setup/SicSetup.csproj @@ -8,8 +8,8 @@ {C842F167-DB8E-4827-ACDD-74215AF5100A} WinExe Properties - Sic_Setup - Sic_Setup + SicSetup + SicSetup v4.8