Merge branch 'master' of http://git.jetplasma-oa.com/JetPlasma/Venus

Venus/Venus_MainPages/ViewModels/VceViewModel.cs

@@ -28,7 +28,7 @@ namespace Venus_MainPages.ViewModels
     {
         private double _PositionZ;//支撑底柱高度
         private double _TransformData;
-        private double m_PositionZ;
+        //private double m_PositionZ;
         //private Image VceWaferNames;
         private int _GotoSlot;
         private bool m_VCEDoorIsOpen;//是否开门
@@ -37,7 +37,7 @@ namespace Venus_MainPages.ViewModels
         private List<string> m_RtDataKeys = new List<string>();
 
         private bool m_VCEIsInstalled;
-        private bool m_isGotoLP;
+        //private bool m_isGotoLP;
         private int m_GoToSlotNumber;
         private int m_VCE1WaferCount;//wafer数量
 

Venus/Venus_MainPages/ViewModels/VenusSeOperationOverViewModel.cs

@@ -714,7 +714,7 @@ namespace Venus_MainPages.ViewModels
                 RobotLowerWafer = TMModuleInfo.WaferManager.Wafers[1];
                 PAWafer = ModuleManager.ModuleInfos["VPA"].WaferManager.Wafers[0];
             }
-            catch (Exception ex)
+            catch
             {
 
             }

Venus/Venus_MainPages/ViewModels/WaferDialogViewModel.cs

@@ -11,7 +11,7 @@ namespace Venus_MainPages.ViewModels
 {
     public class WaferDialogViewModel : BindableBase
     {
-        private string m_title;
+        //private string m_title;
         public string _ConfirmText;
         public string ConfirmText
         {

Venus/Venus_RT/Config/System.sccfg

@@ -255,6 +255,7 @@
 		<config default="30" name="HomeTimeout" nameView="Home Timeout" description="TM初始化超时" max="300" min="1" paramter="" tag="" unit="s" type="Integer" />
 		<config default="60" name="MotionTimeout" nameView="Motion Timeout" description="motion time out" max="600" min="1" paramter="" tag="" unit="s" type="Integer" />
 		<config default="127.0.0.1:1103" name="IPAddress" nameView="IP Address" description="TM Robot IP、端口设置;default 10.0.0.100:13000" max="" min="" paramter="" tag="" unit="" type="String" />
+		<config default="COM160" name="VPAPort" nameView="VP APort" description="TM PreAligner COM口号" max="" min="" paramter="" tag="" unit="" type="String" />
 		<config default="2" name="PMAStationNumber" nameView="PMA Station Number" description="PMA Station Number" max="99" min="0" paramter="" tag="" unit="" type="Integer" />
 		<config default="3" name="PMBStationNumber" nameView="PMB Station Number" description="PMB Station Number" max="99" min="0" paramter="" tag="" unit="" type="Integer" />
 		<config default="4" name="PMCStationNumber" nameView="PMC Station Number" description="PMC Station Number" max="99" min="0" paramter="" tag="" unit="" type="Integer" />

Venus/Venus_RT/Devices/JetVenusSEPM.cs

@@ -26,7 +26,7 @@ namespace Venus_RT.Devices
         #region io变量定义
         private readonly IoLid _Lid;
 
-        private readonly IoCylinder _slitDoor;
+        //private readonly IoCylinder _slitDoor;
         private readonly IoCylinder _LiftPin;
 
         private readonly IoValve _PVN21Valve;
@@ -78,7 +78,7 @@ namespace Venus_RT.Devices
         private readonly IoValve _GuageValve;
         private readonly IoValve _PVHe3Valve;
         private readonly IoValve _HeISOValve;
-        private readonly IoValve _MainPurgeValve;//新增
+        //private readonly IoValve _MainPurgeValve;//新增
 
         private readonly IoSensor _ATM_sw;
         private readonly IoSensor _CDAPressure;
@@ -114,7 +114,7 @@ namespace Venus_RT.Devices
         private readonly IoGasStick _gasLineN2;
         private readonly IoBacksideHe _backsideHe;
 
-        private readonly IoMfc _heMfc;
+        //private readonly IoMfc _heMfc;
 
         private readonly double _foreline_interlock_pressure = 750;
 
@@ -330,7 +330,7 @@ namespace Venus_RT.Devices
                 { ValveType.TurboPumpPurge,  _TurboPumpPurgeValve},
                 { ValveType.Guage,  _GuageValve},
                 { ValveType.HeISO,  _HeISOValve},
-                { ValveType.MainPurge,_MainPurgeValve}
+                //{ ValveType.MainPurge,_MainPurgeValve}
             };
         }
         #endregion

Venus/Venus_RT/Devices/PreAligner/HongHuVPA.cs

@@ -68,7 +68,7 @@ namespace Venus_RT.Devices.PreAligner
         public HongHuVPA(ModuleName module)
         {
             _module = module;
-            string port = "COM160";
+            string port = SC.GetStringValue($"SETM.VPAPort");
             _serialport = new AsyncSerialPort(port, 9600, 8, Parity.None, StopBits.One, _newLine, _IsAsciiMode);
             WaferManager.Instance.SubscribeLocation(_module, 1);
             _serialport.Open();

Venus/Venus_RT/Devices/SMIF/FortrendPLUS500.cs

@@ -42,7 +42,7 @@ namespace Venus_RT.Devices.SMIF
         }
 
 
-        private AsyncSerialPort _serialport;
+        //private AsyncSerialPort _serialport;
         private string _portname;
         //connect status
         public bool IsConnected;

Venus/Venus_RT/Devices/TM/HongHuTM.cs

@@ -34,18 +34,18 @@ namespace Venus_RT.Devices
         private readonly IoValve _VCEFastVentValve;
 
         //判断信号
-        private readonly IoSensor _VCESlitDoorOpen;
-        private readonly IoSensor _PMASlitDoorOpen;
-        private readonly IoSensor _PMBSlitDoorOpen;
-        private readonly IoSensor _PMCSlitDoorOpen;
+        //private readonly IoSensor _VCESlitDoorOpen;
+        //private readonly IoSensor _PMASlitDoorOpen;
+        //private readonly IoSensor _PMBSlitDoorOpen;
+        //private readonly IoSensor _PMCSlitDoorOpen;
         private readonly IoSensor _VCESlitDoorOpenEnable;
         private readonly IoSensor _PMASlitDoorOpenEnable;
         private readonly IoSensor _PMBSlitDoorOpenEnable;
         private readonly IoSensor _PMCSlitDoorOpenEnable;
-        private readonly IoSensor _TMExtendVCEEnable;
-        private readonly IoSensor _TMExtendPMAEnable;
-        private readonly IoSensor _TMExtendPMBEnable;
-        private readonly IoSensor _TMExtendPMCEnable;
+        //private readonly IoSensor _TMExtendVCEEnable;
+        //private readonly IoSensor _TMExtendPMAEnable;
+        //private readonly IoSensor _TMExtendPMBEnable;
+        //private readonly IoSensor _TMExtendPMCEnable;
         private readonly IoSensor _TMVACSensor;
         private readonly IoSensor _VCEVACSensor;
         private readonly IoSensor _VCEATMSensor;
@@ -144,10 +144,10 @@ namespace Venus_RT.Devices
         public bool PMBSlitDoorOpenEnable => _PMBSlitDoorOpenEnable.Value;
         public bool PMCSlitDoorOpenEnable => _PMCSlitDoorOpenEnable.Value;
         //Robot动作
-        public bool TMExtendVCEEnable => _TMExtendVCEEnable.Value;
-        public bool TMExtendPMAEnable => _TMExtendPMAEnable.Value;
-        public bool TMExtendPMBEnable => _TMExtendPMBEnable.Value;
-        public bool TMExtendPMCEnable => _TMExtendPMCEnable.Value;
+        //public bool TMExtendVCEEnable => _TMExtendVCEEnable.Value;
+        //public bool TMExtendPMAEnable => _TMExtendPMAEnable.Value;
+        //public bool TMExtendPMBEnable => _TMExtendPMBEnable.Value;
+        //public bool TMExtendPMCEnable => _TMExtendPMCEnable.Value;
 
         public double TMPressure => _TMPressure.Value;
         public double VCEPressure => _VCEPressure.Value;

Venus/Venus_RT/Modules/ResourceMonitor.cs

@@ -285,7 +285,7 @@ namespace Venus_RT.Modules
             //获得物理内存
             var managementClass = new ManagementClass("Win32_ComputerSystem");
             var managementObjectCollection = managementClass.GetInstances();
-            long PhysicalMemory;
+            //long PhysicalMemory;
             foreach (var managementBaseObject in managementObjectCollection)
                 if (managementBaseObject["TotalPhysicalMemory"] != null)
                 {

Venus/Venus_RT/Modules/SETMCycle.cs

@@ -347,9 +347,9 @@ namespace Venus_RT.Modules
                         ModuleName module = ModuleHelper.Converter(mod);
                         tmCycleRoutine.Add(module);
                     }
-                    catch (Exception _)
+                    catch (Exception ex)
                     {
-                        LOG.Write(eEvent.ERR_ROUTER, ModuleName.System, $"Invalid module string: {mod}");
+                        LOG.Write(eEvent.ERR_ROUTER, ModuleName.System, $"Invalid module string: {mod}, Exception:{ex}");
                         return RState.Failed;
                     }
                 }
@@ -689,7 +689,7 @@ namespace Venus_RT.Modules
                                     && _moveQueue.Count == 0
                                     )
                                 {
-                                    ModuleName _destination = ModuleName.TMRobot;
+                                    //ModuleName _destination = ModuleName.TMRobot;
                                     _moveQueue.Add(new MoveItem((ModuleName)wafer.OriginStation, wafer.OriginSlot, ModuleName.TMRobot, 0, 0));
                                     return;
                                 }

Venus/Venus_RT/Modules/TM/VenusEntity/SEMFPMExtendRoutine.cs

@@ -30,11 +30,11 @@ namespace Venus_RT.Modules.TM.VenusEntity
         private readonly HongHuTM _TM;
         private readonly ITransferRobot _robot;
         private IPreAlign _vpa;
-        private bool _queryAwc;
+        //private bool _queryAwc;
         private ModuleName _targetModule;
         private PMEntity _pmModule;
         private VceEntity _vceModule;
-        private bool _VCEFlag = false; //是否考虑VCE slot对齐准备
+        //private bool _VCEFlag = false; //是否考虑VCE slot对齐准备
         private int _targetSlot;
         private Hand _hand;
         private int _extendingTimeout = 120 * 1000;
@@ -45,7 +45,7 @@ namespace Venus_RT.Modules.TM.VenusEntity
             _robot = robot;
             Name = "Extend to PM VCE VPA";
             _vpa = vpa;
-            _queryAwc = false;
+            //_queryAwc = false;
         }
         //开始执行
         public RState Start(params object[] objs)
@@ -72,7 +72,7 @@ namespace Venus_RT.Modules.TM.VenusEntity
             }
             else if (ModuleHelper.IsVCE(_targetModule) && ModuleHelper.IsInstalled(_targetModule))
             {
-                _VCEFlag = true;
+                //_VCEFlag = true;
                 _vceModule = Singleton<RouteManager>.Instance.GetVCE(_targetModule);
                 if (_vceModule.IsError)
                 {

Venus/Venus_RT/Modules/TM/VenusEntity/SEMFPMPickRoutine.cs

@@ -45,7 +45,7 @@ namespace Venus_RT.Modules.TM.VenusEntity
         private PMEntity _pmModule;
         //private JetChamber _chamber;
 
-        private DateTime _starttime;
+        //private DateTime _starttime;
         private bool _queryAwc;
 
         public SEMFPMPickRoutine(HongHuTM honghutm,ITransferRobot robot) : base(ModuleName.TMRobot)

Venus/Venus_RT/Modules/TM/VenusEntity/SEMFPMRetractRoutine.cs

@@ -30,7 +30,7 @@ namespace Venus_RT.Modules.TM.VenusEntity
 
         private readonly HongHuTM _TM;
         private readonly ITransferRobot _robot;
-        private bool _queryAwc;
+        //private bool _queryAwc;
         private IPreAlign _vpa;
         private ModuleName _targetModule;
         private PMEntity _pmModule;
@@ -45,7 +45,7 @@ namespace Venus_RT.Modules.TM.VenusEntity
             _robot = robot;
             Name = "Retract to PM VCE VPA";
             _vpa = vpa;
-            _queryAwc = false;
+            //_queryAwc = false;
         }
         //开始执行
         public RState Start(params object[] objs)