1.Kepler2200 添加Home 设备断开重连功能

2.VenusSE 添加Recipe Tolerance  Checker Range默认值

Venus/Framework/Common/Communications/AsyncSerialPort.cs

@@ -3,14 +3,9 @@ using System.Collections;
 using System.IO.Ports;
 using System.Text;
 using System.Diagnostics;
-using Aitex.Core.RT.Event;
 using Aitex.Core.RT.Log;
-using MECF.Framework.Common.Utilities;
 using Aitex.Core.RT.SCCore;
-using MECF.Framework.Common.SCCore;
-using Aitex.Core.Util;
 using System.Linq;
-using DocumentFormat.OpenXml.Drawing;
 
 namespace MECF.Framework.Common.Communications
 {
@@ -338,6 +333,29 @@ namespace MECF.Framework.Common.Communications
 
             return false;
         }
+
+        public bool ReConnect()
+        {
+            string[] coms  = SerialPort.GetPortNames();
+            for (int i = 0; i < coms.Length; i++)
+            {
+                //找到目标串口
+                if (coms[i].ToUpper() == PortName)
+                {
+                    //判断目标串口是否打开
+                    if (_port.IsOpen)
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        Open();
+                        return _port.IsOpen;
+                    }
+                }
+            }
+            return false;
+        }
     }
 }
 

Venus/Framework/Common/Communications/AsyncSocketDevice.cs

@@ -56,11 +56,11 @@ namespace MECF.Framework.Common.Communications
         private string _ip;
         private int _port;
 
-        
+
 
         public bool IsConnected { get { return (_socket != null && _socket.Connected); } }
 
-        public AsyncSocketDevice(string address, string newline ="\r")
+        public AsyncSocketDevice(string address, string newline = "\r")
         {
             //        Connect(address);
             _socket = null;
@@ -76,15 +76,15 @@ namespace MECF.Framework.Common.Communications
         {
             try
             {
-                _ip =address.Split(':')[0];
-                _port =int.Parse(address.Split(':')[1]);
+                _ip = address.Split(':')[0];
+                _port = int.Parse(address.Split(':')[1]);
                 IPAddress ipAddress = IPAddress.Parse(_ip);
                 IPEndPoint remoteEP = new IPEndPoint(ipAddress, _port);
 
                 //Dispose current socket and create a TCP/IP socket.
                 Dispose();
 
-                if(_socket == null)
+                if (_socket == null)
                     _socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
 
                 // Connect to the remote endpoint.     
@@ -106,13 +106,13 @@ namespace MECF.Framework.Common.Communications
                 Socket client = (Socket)ar.AsyncState;
                 // Complete the connection.   
                 client.EndConnect(ar);
-                
-                EV.PostMessage(ModuleName.Robot.ToString(), EventEnum.TCPConnSucess, _ip, _port.ToString());      
+
+                EV.PostMessage(ModuleName.Robot.ToString(), EventEnum.TCPConnSucess, _ip, _port.ToString());
 
                 // Receive the response from the remote device. 
                 Receive(_socket);
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 //LOG.Write(e);
                 string reason = string.Format("Communication  {0}:{1:D} {2}.", _ip, _port, e.Message);
@@ -193,7 +193,7 @@ namespace MECF.Framework.Common.Communications
                 }
 
                 return true;
-                
+
             }
             catch (Exception ex)
             {
@@ -252,5 +252,18 @@ namespace MECF.Framework.Common.Communications
                 OnErrorHappened(new ErrorEventArgsDevice(reason));
             }
         }
+
+        public bool ReConnect()
+        {
+            if (IsConnected)
+            {
+                return true;
+            }
+            _socket.Shutdown(SocketShutdown.Both);
+            _socket.Close();
+            _socket.Dispose();
+            Connect(_ip);
+            return IsConnected;
+        }
     }
 }

Venus/Framework/Common/Device/Bases/ChillerBase.cs

@@ -83,6 +83,10 @@ namespace MECF.Framework.Common.Device.Bases
         public virtual void Monitor() { }
 
         public virtual void Reset() { }
+        public virtual bool ReConnect()
+        {
+            return true;
+        }
 
     }
 }

Venus/Framework/Common/Device/Bases/RfMatchBase.cs

@@ -26,8 +26,6 @@ namespace MECF.Framework.Common.Device.Bases
         public virtual float DCBias { get; set; }
         public virtual float BiasPeak { get; set; }
 
-        public virtual bool IsConnected { get; }
-
         public virtual AITRfMatchData DeviceData { get; set; }
 
         protected RfMatchBase() : base()
@@ -258,7 +256,7 @@ namespace MECF.Framework.Common.Device.Bases
         }
         public virtual bool  ReConnect()
         {
-            return false;
+            return true;
         }
     }
 }

Venus/Framework/Common/Device/Bases/RfPowerBase.cs

@@ -327,5 +327,9 @@ namespace MECF.Framework.Common.Device.Bases
 
             return ret;
         }
+        public virtual bool ReConnect()
+        {
+            return true;
+        }
     }
 }

Venus/Framework/Common/IOCore/IoProvider.cs

@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
 using System.Xml;
-using Aitex.Core.RT.DataCenter;
 using Aitex.Core.RT.Event;
 using Aitex.Core.RT.Log;
 using Aitex.Core.Util;

Venus/Framework/Common/IOCore/IoProviderManager.cs

@@ -274,34 +274,8 @@ namespace MECF.Framework.RT.Core.IoProviders
                     }
                     else
                     {
-                        // JetChamber jetChamber = (JetChamber)Enum.Parse(typeof(JetChamber), SC.GetStringValue($"{mapModule}.ChamberType"));
-                        JetChamber jetChamber = (JetChamber)SC.GetValue<int>($"{mapModule}.ChamberType");
-                        //switch (jetChamber)
-                        //{
-                        //    //case JetChamber.Venus:
-                        //    //    mapFile= "PM" + "\\" + "Venus" + "\\" + "VenusIoDefine.xml";
-                        //    //    break;
-
-                        //    case JetChamber.Kepler2300:
-                        //        mapFile = "PM" + "\\" + "Kepler2300" + "\\" + "Kepler2300IoDefine.xml";
-                        //        break;
-                        //    case JetChamber.Kepler2200A:
-                        //        mapFile = "PM" + "\\" + "Kepler2200A" + "\\" + "Kepler2200AIoDefine.xml";
-                        //        break;
-                        //    case JetChamber.Kepler2200B:
-                        //        //mapFile = jetChamber.ToString() + "\\" + "_ioDefineKepler.xml";
-                        //        mapFile= "PM" + "\\" + "Kepler2200B" + "\\" + "Kepler2200BIoDefine.xml";
-                        //        break;
-                        //    case JetChamber.VenusSE:
-                        //        mapFile = "PM" + "\\" + "VenusSE" + "\\" + "VenusSEIoDefine.xml";
-                        //        break;
-                        //    case JetChamber.VenusDE:
-                        //        mapFile = "PM" + "\\" + "VenusDE" + "\\" + "VenusDEIoDefine.xml";
-                        //        break;
-
-                        //}
+                        JetChamber jetChamber = (JetChamber)SC.GetValue<int>($"{mapModule}.ChamberType");                      
                         mapFile = $"PM" + "\\" + $"{jetChamber}" + "\\" + $"{jetChamber}IoDefine.xml";
-
                     }
 
 

Venus/Venus_Core/ProcessUnitDefine.cs

@@ -88,17 +88,17 @@ namespace Venus_Core
     {
         public string UnitName { get; set; } = "PressureModeUnit";
         [IsTolerance]
-        public ToleranceMode ToleranceMode { get; set; }
+        public ToleranceMode ToleranceMode { get; set; } = ToleranceMode.Value;
         [IsTolerance]
         [CustomName("ToleranceDelayTime(ms)")]
-        public int ToleranceDelayTime { get; set; }
+        public int ToleranceDelayTime { get; set; } = 3000;
        
         public PressureUnitMode PressureUnitMode { get; set; }
         public float StartValue { get; set; }
         [IsTolerance]
-        public int StartValueWarningRange { get; set; }
+        public int StartValueWarningRange { get; set; } = 5;
         [IsTolerance]
-        public int StartValueAlarmRange { get; set; }
+        public int StartValueAlarmRange { get; set; } = 10;
         public int ValvePositionPreset { get; set; }
         [IsCanConfigIgnore]
         public bool EnableRamp { get; set; }
@@ -145,18 +145,16 @@ namespace Venus_Core
             set { m_UnitName = value; }
         }
         [IsTolerance]
-        public ToleranceMode ToleranceMode { get; set; }
+        public ToleranceMode ToleranceMode { get; set; } = ToleranceMode.Value;
         [IsTolerance]
         [CustomName("ToleranceDelayTime(ms)")]
-        public int ToleranceDelayTime { get; set; }
+        public int ToleranceDelayTime { get; set; } = 3000;
         [CustomName("RF Power(W)")]
         public int RFPower { get; set; }
         [IsTolerance]
-        public int RFPowerWarningRange { get; set; }
+        public int RFPowerWarningRange { get; set; } = 5;
         [IsTolerance]
-        public int RFPowerAlarmRange { get; set; }
-        //[JsonProperty(PropertyName = "C1(%)")]
-        //[DataMember(Name = "C1(%)")]
+        public int RFPowerAlarmRange { get; set; } = 10;
         [CustomName("C1(%)")]
         public float C1 { get; set; }
         [CustomName("C2(%)")]
@@ -182,22 +180,19 @@ namespace Venus_Core
         //public int StartPower { get; set; }
         public int TargetRFPower { get; set; }       
     }
-
-
-
     public class BiasUnit : ProcessUnitBase
     {
         public string UnitName { get; set; } = "BiasUnit";
         [IsTolerance]
-        public ToleranceMode ToleranceMode { get; set; }
+        public ToleranceMode ToleranceMode { get; set; } = ToleranceMode.Value;
         [IsTolerance]
         [CustomName("ToleranceDelayTime(ms)")]
-        public int ToleranceDelayTime { get; set; }
+        public int ToleranceDelayTime { get; set; } = 3000;
         //public int RFPower { get; set; }
         [IsTolerance]
-        public int RFPowerWarningRange { get; set; }
+        public int RFPowerWarningRange { get; set; } = 5;
         [IsTolerance]
-        public int RFPowerAlarmRange { get; set; }
+        public int RFPowerAlarmRange { get; set; } = 10;
         [CustomName("BiasRF Power(W)")]
 
         public int BiasRFPower { get; set; }
@@ -238,7 +233,6 @@ namespace Venus_Core
         public float C1 { get; set; }
     }
 
-
     public class GasControlUnit : ProcessUnitBase
     {
         public string UnitName { get; set; } = "GasControlUnit";
@@ -347,81 +341,81 @@ namespace Venus_Core
     {
         public string UnitName { get; set; } = "SEGasControlUnit";
         [IsTolerance]
-        public ToleranceMode ToleranceMode { get; set; }
+        public ToleranceMode ToleranceMode { get; set; } = ToleranceMode.Value;
         [IsTolerance]
         [CustomName("ToleranceDelayTime(ms)")]
-        public int ToleranceDelayTime { get; set; }
+        public int ToleranceDelayTime { get; set; } = 3000;
         public int Gas1 { get; set; }
         [IsTolerance]
-        public int Gas1WarningRange { get; set; }
+        public int Gas1WarningRange { get; set; } = 5;
         [IsTolerance]
-        public int Gas1AlarmRange { get; set; }
+        public int Gas1AlarmRange { get; set; } = 10;
         public int Gas2 { get; set; }
         [IsTolerance]
-        public int Gas2WarningRange { get; set; }
+        public int Gas2WarningRange { get; set; } = 5;
         [IsTolerance]
-        public int Gas2AlarmRange { get; set; }
+        public int Gas2AlarmRange { get; set; } = 10;
         public int Gas3 { get; set; }
         [IsTolerance]
-        public int Gas3WarningRange { get; set; }
+        public int Gas3WarningRange { get; set; } = 5;
         [IsTolerance]
-        public int Gas3AlarmRange { get; set; }
+        public int Gas3AlarmRange { get; set; } = 10;
         public int Gas4 { get; set; }
         [IsTolerance]
-        public int Gas4WarningRange { get; set; }
+        public int Gas4WarningRange { get; set; } = 5;
         [IsTolerance]
-        public int Gas4AlarmRange { get; set; }
+        public int Gas4AlarmRange { get; set; } = 10;
         public int Gas5 { get; set; }
         [IsTolerance]
-        public int Gas5WarningRange { get; set; }
+        public int Gas5WarningRange { get; set; } = 5;
         [IsTolerance]
-        public int Gas5AlarmRange { get; set; }
+        public int Gas5AlarmRange { get; set; } = 10;
         public int Gas6 { get; set; }
         [IsTolerance]
-        public int Gas6WarningRange { get; set; }
+        public int Gas6WarningRange { get; set; } = 5;
         [IsTolerance]
-        public int Gas6AlarmRange { get; set; }
+        public int Gas6AlarmRange { get; set; } = 10;
         public int Gas7 { get; set; }
         [IsTolerance]
-        public int Gas7WarningRange { get; set; }
+        public int Gas7WarningRange { get; set; } = 5;
         [IsTolerance]
-        public int Gas7AlarmRange { get; set; }
+        public int Gas7AlarmRange { get; set; } = 10;
         public int Gas8 { get; set; }
         [IsTolerance]
-        public int Gas8WarningRange { get; set; }
+        public int Gas8WarningRange { get; set; } = 5;
         [IsTolerance]
-        public int Gas8AlarmRange { get; set; }
+        public int Gas8AlarmRange { get; set; } = 10;
         public int Gas9 { get; set;}
         [IsTolerance]
-        public int Gas9WarningRange { get; set; }
+        public int Gas9WarningRange { get; set; } = 5;
         [IsTolerance]
-        public int Gas9AlarmRange { get; set; }
+        public int Gas9AlarmRange { get; set; } = 10;
         public int Gas10 { get; set;}
         [IsTolerance]
-        public int Gas10WarningRange { get; set; }
+        public int Gas10WarningRange { get; set; } = 5;
         [IsTolerance]
-        public int Gas10AlarmRange { get; set; }
+        public int Gas10AlarmRange { get; set; } = 10;
         public int Gas11 { get; set;}
         [IsTolerance]
-        public int Gas11WarningRange { get; set; }
+        public int Gas11WarningRange { get; set; } = 5;
         [IsTolerance]
-        public int Gas11AlarmRange { get; set; }
+        public int Gas11AlarmRange { get; set; } = 10;
         public int Gas12 { get; set;}
         [IsTolerance]
-        public int Gas12WarningRange { get; set; }
+        public int Gas12WarningRange { get; set; } = 5;
         [IsTolerance]
-        public int Gas12AlarmRange { get; set; }
+        public int Gas12AlarmRange { get; set; } = 10;
     }
 
     public class ESCHVUnit : ProcessUnitBase
     {
         public string UnitName { get; set; } = "ESCHVUnit";
+        [CustomName("BacksideHelium(Torr)")]
         public int BacksideHelium { get; set; }
         [CustomName("HeCheckDelayTime(ms)")]
         public int CheckDelay { get; set; }
         public float MinHeFlow { get; set; }
         public float MaxHeFlow { get; set; }
-
         public int ESCClampValtage { get; set; }
     }
     public class ProcessKitUnit : ProcessUnitBase

Venus/Venus_RT/App.config

@@ -32,7 +32,7 @@
 	<connectionStrings>
 		<add name="PostgreSQL"   connectionString="Server=localhost;Port=5432;User Id=postgres;Password=123456;Database=postgres;Enlist=true;Preload Reader=true;" />
 		<!--0是other,1是kepler2300，2是Kepler2200，3是VenusSE，4是VenusDE-->
-		<add name="ConfigType"   connectionString="3"/>
+		<add name="ConfigType"   connectionString="1"/>
 	</connectionStrings>
 	<system.serviceModel>
 		<!--<diagnostics>

Venus/Venus_RT/Devices/AdTecRF.cs

@@ -19,6 +19,7 @@ using MECF.Framework.Common.Equipment;
 using Venus_Core;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Net.Sockets;
 
 namespace Venus_RT.Devices
 {
@@ -671,6 +672,10 @@ namespace Venus_RT.Devices
             return true;
             //return _serial.Write(str + "\r");
         }
+        public override bool ReConnect()
+        {
+            return _serial.ReConnect();
+        }
     }
 
     #endregion RFG

Venus/Venus_RT/Devices/AdixenTurboPump.cs

@@ -475,17 +475,7 @@ namespace Venus_RT.Devices
         }
         public override bool ReConnect()
         {
-            _serial.Open();
-
-            if (!IsConnected)
-            {
-                _serial.Open();
-                return IsConnected;
-            }
-            else
-            {
-                return true;
-            }
+           return _serial.ReConnect();          
         }
     }
 }

Venus/Venus_RT/Devices/DeviceManager.cs

@@ -170,212 +170,11 @@ namespace Venus_RT.Instances
             device_model_file = PathManager.GetCfgDir() + "PM" + "\\" + jetChamber.ToString() + "\\" + $"{jetChamber.ToString()}DeviceModel.xml";
             Initialize(device_model_file, jetChamber.ToString(), mod, mod.ToString());
 
-            //if (SC.GetValue<int>($"{mod}.Rf.CommunicationType") == (int)CommunicationType.RS232 &&
-            //    SC.GetValue<int>($"{mod}.Rf.MFG") == (int)GeneratorMFG.AdTec)
-            //{
-            //    AddCustomModuleDevice(new AdTecGenerator(mod, Venus_Core.VenusDevice.Rf));
-            //}
-
-
-
-            //if (jetChamber == JetChamber.Kepler2300)
-            //{
-            //    if (SC.GetValue<bool>($"{mod}.InnerChiller.EnableChiller") &&
-            //       SC.GetValue<int>($"{mod}.InnerChiller.CommunicationType") == (int)CommunicationType.RS232)
-            //    {
-            //        if (SC.GetValue<int>($"{mod}.InnerChiller.MFG") == (int)ChillerMFG.SMC)
-            //        {
-            //            AddCustomModuleDevice(new SMCChiller(mod, "InnerChiller"));
-            //        }
-            //        else if (SC.GetValue<int>($"{mod}.InnerChiller.MFG") == (int)ChillerMFG.AIRSYS)
-            //        {
-            //            AddCustomModuleDevice(new AIRSYSChiller(mod, "InnerChiller"));
-            //        }
-            //    }
-            //    if (SC.GetValue<bool>($"{mod}.OuterChiller.EnableChiller") &&
-            //       SC.GetValue<int>($"{mod}.OuterChiller.CommunicationType") == (int)CommunicationType.RS232)
-            //    {
-            //        if (SC.GetValue<int>($"{mod}.OuterChiller.MFG") == (int)ChillerMFG.SMC)
-            //        {
-            //            AddCustomModuleDevice(new SMCChiller(mod, "OuterChiller"));
-            //        }
-            //        else if (SC.GetValue<int>($"{mod}.OuterChiller.MFG") == (int)ChillerMFG.AIRSYS)
-            //        {
-            //            AddCustomModuleDevice(new AIRSYSChiller(mod, "OuterChiller"));
-            //        }
-            //    }
-            //    if (SC.GetValue<bool>($"{mod}.TopChiller.EnableChiller") &&
-            //      SC.GetValue<int>($"{mod}.TopChiller.CommunicationType") == (int)CommunicationType.RS232)
-            //    {
-            //        if (SC.GetValue<int>($"{mod}.TopChiller.MFG") == (int)ChillerMFG.SMC)
-            //        {
-            //            AddCustomModuleDevice(new SMCChiller(mod, "TopChiller"));
-            //        }
-            //        else if (SC.GetValue<int>($"{mod}.TopChiller.MFG") == (int)ChillerMFG.AIRSYS)
-            //        {
-            //            AddCustomModuleDevice(new AIRSYSChiller(mod, "TopChiller"));
-            //        }
-            //    }
-            //}
-
-
-            //if (jetChamber == JetChamber.Kepler2200B)
-            //{
-            //    if (SC.GetValue<bool>($"{mod}.RFBox.EnableMatch") &&
-            //                       SC.GetValue<int>($"{mod}.RFBox.CommunicationType") == (int)CommunicationType.RS232 &&
-            //                       SC.GetValue<int>($"{mod}.RFBox.MFG") == (int)MatchMFG.AdTec)
-            //    {
-            //        AddCustomModuleDevice(new AdTecMatch(mod, Venus_Core.VenusDevice.RFBox));
-            //    }
-            //    else if (SC.GetValue<bool>($"{mod}.RFBox.EnableMatch") &&
-            //        SC.GetValue<int>($"{mod}.RFBox.CommunicationType") == (int)CommunicationType.RS232 &&
-            //        SC.GetValue<int>($"{mod}.RFBox.MFG") == (int)MatchMFG.Revtech)
-            //    {
-            //        AddCustomModuleDevice(new RevtechMatch(mod, Venus_Core.VenusDevice.RFBox, MatchCommunicationType.RS232));
-            //    }
-            //    else if (SC.GetValue<bool>($"{mod}.RFBox.EnableMatch") &&
-            //        SC.GetValue<int>($"{mod}.RFBox.CommunicationType") == (int)CommunicationType.Ethernet &&
-            //        SC.GetValue<int>($"{mod}.RFBox.MFG") == (int)MatchMFG.Revtech)
-            //    {
-            //        AddCustomModuleDevice(new RevtechMatch(mod, Venus_Core.VenusDevice.RFBox, MatchCommunicationType.Ethernet));
-            //    }
-            //    else if (SC.GetValue<bool>($"{mod}.RFBox.EnableMatch") &&
-            //        SC.GetValue<int>($"{mod}.RFBox.MFG") == (int)MatchMFG.Lz_Ethercat && startEthercatOK)
-            //    {
-            //        AddCustomModuleDevice(new LzMatch_Ethercat(mod, Venus_Core.VenusDevice.RFBox, v_board_id));
-            //    }
-            //}
-            //if (SC.GetValue<bool>($"{mod}.Match.EnableMatch") &&
-            //SC.GetValue<int>($"{mod}.Match.CommunicationType") == (int)CommunicationType.RS232 &&
-            //SC.GetValue<int>($"{mod}.Match.MFG") == (int)MatchMFG.AdTec)
-            //{
-            //    AddCustomModuleDevice(new AdTecMatch(mod, Venus_Core.VenusDevice.Match));
-            //}
-            //else if (SC.GetValue<bool>($"{mod}.Match.EnableMatch") &&
-            //    SC.GetValue<int>($"{mod}.Match.CommunicationType") == (int)CommunicationType.RS232 &&
-            //    SC.GetValue<int>($"{mod}.Match.MFG") == (int)MatchMFG.Revtech)
-            //{
-            //    AddCustomModuleDevice(new RevtechMatch(mod, Venus_Core.VenusDevice.Match, MatchCommunicationType.RS232));
-            //}
-            //else if (SC.GetValue<bool>($"{mod}.Match.EnableMatch") &&
-            //    SC.GetValue<int>($"{mod}.Match.CommunicationType") == (int)CommunicationType.Ethernet &&
-            //    SC.GetValue<int>($"{mod}.Match.MFG") == (int)MatchMFG.Revtech)
-            //{
-            //    AddCustomModuleDevice(new RevtechMatch(mod, Venus_Core.VenusDevice.Match, MatchCommunicationType.Ethernet));
-            //}
-
-
-            //if (jetChamber != JetChamber.Kepler2200A && jetChamber != JetChamber.Kepler2200B)
-            //{
-            //    if (SC.GetValue<bool>($"{mod}.BiasMatch.EnableBiasMatch") &&
-            //        SC.GetValue<int>($"{mod}.BiasMatch.CommunicationType") == (int)CommunicationType.RS232 &&
-            //        SC.GetValue<int>($"{mod}.BiasMatch.MFG") == (int)MatchMFG.AdTec)
-            //    {
-            //        AddCustomModuleDevice(new AdTecMatch(mod, Venus_Core.VenusDevice.BiasMatch));
-            //    }
-            //    else if (SC.GetValue<bool>($"{mod}.BiasMatch.EnableBiasMatch") &&
-            //        SC.GetValue<int>($"{mod}.BiasMatch.CommunicationType") == (int)CommunicationType.RS232 &&
-            //        SC.GetValue<int>($"{mod}.BiasMatch.MFG") == (int)MatchMFG.Revtech)
-            //    {
-            //        AddCustomModuleDevice(new RevtechMatch(mod, Venus_Core.VenusDevice.BiasMatch, MatchCommunicationType.RS232));
-            //    }
-            //    else if (SC.GetValue<bool>($"{mod}.BiasMatch.EnableBiasMatch") &&
-            //        SC.GetValue<int>($"{mod}.BiasMatch.CommunicationType") == (int)CommunicationType.Ethernet &&
-            //        SC.GetValue<int>($"{mod}.BiasMatch.MFG") == (int)MatchMFG.Revtech)
-            //    {
-            //        AddCustomModuleDevice(new RevtechMatch(mod, Venus_Core.VenusDevice.BiasMatch, MatchCommunicationType.Ethernet));
-            //    }
-            //    else if (SC.GetValue<bool>($"{mod}.BiasMatch.EnableBiasMatch") &&
-            //        SC.GetValue<int>($"{mod}.BiasMatch.MFG") == (int)MatchMFG.Lz_Ethercat && startEthercatOK)
-            //    {
-            //        AddCustomModuleDevice(new LzMatch_Ethercat(mod, Venus_Core.VenusDevice.BiasMatch, v_board_id));
-            //    }
-
-            //    if (SC.GetValue<bool>($"{mod}.BiasRf.EnableBiasRF"))
-            //    {
-            //        if (SC.GetValue<int>($"{mod}.BiasRf.CommunicationType") == (int)CommunicationType.Ethernet &&
-            //        SC.GetValue<int>($"{mod}.BiasRf.MFG") == (int)GeneratorMFG.Comet)
-            //        {
-            //            AddCustomModuleDevice(new CometRF(mod, SC.GetStringValue($"{mod}.BiasRf.IPAddress")));
-            //        }
-            //        else if (SC.GetValue<int>($"{mod}.BiasRf.MFG") == (int)GeneratorMFG.AdTec)
-            //        {
-            //            AddCustomModuleDevice(new AdTecGenerator(mod, Venus_Core.VenusDevice.BiasRf));
-            //        }
-            //        else if (SC.GetValue<int>($"{mod}.BiasRf.MFG") == (int)GeneratorMFG.Truplasma_Ethercat && startEthercatOK)
-            //        {
-            //            AddCustomModuleDevice(new TruPlasmaRF_Ethercat(mod, Venus_Core.VenusDevice.BiasRf, v_board_id));
-            //        }
-            //    }
-
-            //    AddCustomModuleDevice(new ESC5HighVoltage(mod));
-
-            //    if (SC.GetValue<bool>($"{mod}.Chiller.EnableChiller") &&
-            // SC.GetValue<int>($"{mod}.Chiller.CommunicationType") == (int)CommunicationType.RS232)
-            //    {
-            //        if (SC.GetValue<int>($"{mod}.Chiller.MFG") == (int)ChillerMFG.SMC)
-            //        {
-            //            AddCustomModuleDevice(new SMCChiller(mod, "Chiller"));
-            //        }
-            //        else if (SC.GetValue<int>($"{mod}.Chiller.MFG") == (int)ChillerMFG.AIRSYS)
-            //        {
-            //            AddCustomModuleDevice(new AIRSYSChiller(mod, "Chiller"));
-            //        }
-            //    }
-
-            //    if (SC.GetValue<bool>($"{mod}.EPD.IsEnabled") == true)
-            //    {
-            //        if (SC.GetValue<int>($"{mod}.EPD.EPDType") == 0)
-            //        {
-            //            AddCustomModuleDevice(new EPDClient(mod));
-            //        }
-            //        else
-            //        {
-            //            AddCustomModuleDevice(new EPDDevice(mod));
-            //        }
-            //    }
-            //}
-
-
-            //if (SC.GetValue<int>($"{mod}.DryPump.CommunicationType") == (int)CommunicationType.RS232)
-            //{
-            //    if (SC.GetValue<int>($"{mod}.DryPump.MFG") == (int)DryPumpMFG.SKY)
-            //    {
-            //        AddCustomModuleDevice(new SkyPump(mod));
-            //    }
-            //    else if (SC.GetValue<int>($"{mod}.DryPump.MFG") == (int)DryPumpMFG.Edwards)
-            //    {
-            //        AddCustomModuleDevice(new EdwardsPump(mod));
-            //    }
-            //}
-
-
-            //AddCustomModuleDevice(new AdixenTurboPump(mod));
-            //AddCustomModuleDevice(new PendulumValve(mod));
-
-
-
-
-
             switch (jetChamber)
             {
-                //case JetChamber.Venus:
-                //    AddEscHighVoltage(mod);
-                //    AddAdixenTurboPump(mod);
-                //    AddEPD(mod);
-                //    AddPendulumValve(mod);
-                //    AddChiller(ChillerType.Chiller, mod);
-                //    AddMatch(mod);
-                //    AddBiasMatch(mod);
-                //    AddRF(mod);
-                //    AddBiasRF(mod);
-                //    AddDryPump(mod);
-                //    AddCustomDevice(new JetVenusPM(mod));
-                    
-                //    break;
                 case JetChamber.Kepler2300:
                     AddAdixenTurboPump(mod);
-                    //AddEPD(mod);
+                    AddEPD(mod);
                     AddPendulumValve(mod);
                     AddChiller(ChillerType.InnerChiller, mod);
                     AddChiller(ChillerType.OuterChiller, mod);

Venus/Venus_RT/Devices/JetKepler2200APM.cs

@@ -54,8 +54,8 @@ namespace Venus_RT.Devices
         private readonly IoValve _TurboPumpPumpingValve;
         private readonly IoValve _TurboPumpPurgeValve;
         private readonly IoValve _GuageValve;
-        private readonly IoValve _LoadlockVentValve;
-        private readonly IoValve _LoadlockPumpingValve;
+        //private readonly IoValve _LoadlockVentValve;
+        //private readonly IoValve _LoadlockPumpingValve;
 
         private readonly IoSensor _ATM_sw;
         private readonly IoSensor _CDAPressure;
@@ -191,28 +191,7 @@ namespace Venus_RT.Devices
         public override float PendulumPressure => _pendulumValve.Pressure;
         public override float PendulumPosition => _pendulumValve.Position;
 
-        public new ModuleName Module { get; }
-
-        //public override MovementPosition LiftPinPosition
-        //{
-        //    get
-        //    {
-        //        MovementPosition pos = MovementPosition.Unknown;
-        //        if (_LiftPin == null)
-        //        {
-        //            return MovementPosition.Down;
-        //        }
-        //        if (_LiftPin.ONFeedback && !_LiftPin.OFFFeedback)
-        //        {
-        //            pos = MovementPosition.Up;
-        //        }
-        //        else if (!_LiftPin.ONFeedback && _LiftPin.OFFFeedback)
-        //        {
-        //            pos = MovementPosition.Down;
-        //        }
-        //        return pos;
-        //    }
-        //}
+        public new ModuleName Module { get; }     
 
         public override bool CheckAtm()
         {
@@ -227,16 +206,7 @@ namespace Venus_RT.Devices
         {
             return _slitDoor.State == CylinderState.Close;
         }
-
-        //public override bool CheckLiftUp()
-        //{
-        //    return _LiftPin.State == CylinderState.Open;
-        //}
-
-        //public override bool CheckLiftDown()
-        //{
-        //    return _LiftPin.State == CylinderState.Close;
-        //}
+      
         public override double TotalGasSetpoint
         {
             get
@@ -308,8 +278,8 @@ namespace Venus_RT.Devices
             _TurboPumpPumpingValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveTurboPumpPumping}");
             _TurboPumpPurgeValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveTurboPumpPurge}");
             _GuageValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveGuage}");
-            _LoadlockVentValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveLoadlockVent}");
-            _LoadlockPumpingValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveLoadlockPumping}");
+            //_LoadlockVentValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveLoadlockVent}");
+            //_LoadlockPumpingValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveLoadlockPumping}");
             _ATM_sw = DEVICE.GetDevice<IoSensor>($"{Module}.SensorATMSwitch");
             _ATM_Loadlock_sw = DEVICE.GetDevice<IoSensor>($"{Module}.SensorLoadlockATMSwitch");
             _N2Pressure_sw = DEVICE.GetDevice<IoSensor>($"{Module}.N2PressureOk");
@@ -562,12 +532,12 @@ namespace Venus_RT.Devices
                 case ValveType.Guage:
                     _GuageValve.TurnValve(on, out _);
                     break;
-                case ValveType.LoadlockVent:
-                    _LoadlockVentValve.TurnValve(on, out _);
-                    break;
-                case ValveType.LoadlockPumping:
-                    _LoadlockPumpingValve.TurnValve(on, out _);
-                    break;
+                //case ValveType.LoadlockVent:
+                //    _LoadlockVentValve.TurnValve(on, out _);
+                //    break;
+                //case ValveType.LoadlockPumping:
+                //    _LoadlockPumpingValve.TurnValve(on, out _);
+                //    break;
                 case ValveType.Mfc1:
                     _Mfc1Valve.TurnValve(on, out _);
                     break;
@@ -645,71 +615,19 @@ namespace Venus_RT.Devices
 
         public override void Home()
         {
-            //if (_slitDoor.State == CylinderState.Open)
-            //{
-            //    SetSlitDoor(false, out _);
-            //}
             //2023/03/08添加
             OpenValve(ValveType.PVN22, true);
 
-            //if (_Match.IsConnected == false)
-            //{
-            //    _Match.ReConnect();
-            //}
-            //if (_TurboPump.IsConnected == false)
-            //{
-            //    _TurboPump.ReConnect();
-            //}
+            _Generator?.ReConnect();
+            _Match?.ReConnect();
+            _MainPump?.ReConnect();
+            _TurboPump?.ReConnect();
+            _pendulumValve?.ReConnect();
         }
 
 
 
-        //public override bool SetSlitDoor(bool open, out string reason)
-        //{
-        //    if (open)
-        //    {
-        //        if (RouteManager.IsATMMode)
-        //        {
-        //            if (!IsATM)
-        //            {
-        //                reason = $"{Module} is not ATM, can not open slit door";
-        //                LOG.Write(eEvent.ERR_DEVICE_INFO, Module, reason);
-        //                return false;
-        //            }
-
-        //            if (!IsTMATM)
-        //            {
-        //                reason = $"LoadLock is not ATM, can not open slit door";
-        //                LOG.Write(eEvent.ERR_DEVICE_INFO, Module, reason);
-        //                return false;
-        //            }
-        //        }
-        //        else
-        //        {
-
-        //            double maxPressureDifference = SC.GetValue<double>("System.PMTMMaxPressureDifference");
-        //            if (Math.Abs(TMPressure - ChamberPressure) > maxPressureDifference)
-        //            {
-        //                reason = $"{Module} and TM pressure difference exceeds the max limit {maxPressureDifference}, TMPressure:{TMPressure}, {Module}Pressure:{ChamberPressure}";
-        //                LOG.Write(eEvent.ERR_DEVICE_INFO, Module, reason);
-        //                return false;
-        //            }
-        //        }
-
-        //    }
-
-        //    return _slitDoor.SetCylinder(open, out reason);
-        //}
-
-        //public override bool RetractWafer()
-        //{
-        //    return _LoadLockArm.SetCylinder(false, out _);
-        //}
-
-        //public override bool ExtendWafer()
-        //{
-        //    return _LoadLockArm.SetCylinder(true, out _);
-        //}
+       
         public override bool FlowGas(int gasNum, double val)
         {
             if (_gasLines.Length <= gasNum)
@@ -862,12 +780,6 @@ namespace Venus_RT.Devices
                 return false;
             }
 
-            //if ((device == VenusDevice.ESCHV || device == VenusDevice.BiasRf) && WaferManager.Instance.CheckNoWafer(Module, 0))
-            //{
-            //    LOG.Write(evt, Module, $"Cannot Power ON {device} as {Module} has no wafer");
-            //    return false;
-            //}
-
             return true;
         }
 
@@ -1010,7 +922,7 @@ namespace Venus_RT.Devices
                 }
                 if (_GasRFStopWatch.ElapsedMilliseconds > 1500 && _GasRFStopWatch.ElapsedMilliseconds < 2500)
                 {
-                    var item = _GasRFStopWatch.ElapsedMilliseconds;
+                    //var item = _GasRFStopWatch.ElapsedMilliseconds;
                     _GasRFStopWatch.Reset();
                     _GasFlag = true;
                     return true;

Venus/Venus_RT/Devices/JetKepler2200BPM.cs

@@ -10,8 +10,6 @@ using Venus_Core;
 using Venus_RT.Devices.IODevices;
 using IoMfc = Venus_RT.Devices.IODevices.IoMfc;
 using System.Threading.Tasks;
-using Venus_RT.Modules;
-using Aitex.Core.RT.DataCenter;
 using System.Diagnostics;
 
 namespace Venus_RT.Devices
@@ -57,8 +55,8 @@ namespace Venus_RT.Devices
         private readonly IoValve _TurboPumpPumpingValve;
         private readonly IoValve _TurboPumpPurgeValve;
         private readonly IoValve _GuageValve;
-        private readonly IoValve _LoadlockVentValve;
-        private readonly IoValve _LoadlockPumpingValve;
+        //private readonly IoValve _LoadlockVentValve;
+        //private readonly IoValve _LoadlockPumpingValve;
 
         private readonly IoSensor _ATM_sw;
         private readonly IoSensor _CDAPressure;
@@ -341,8 +339,8 @@ namespace Venus_RT.Devices
             _TurboPumpPumpingValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveTurboPumpPumping}");
             _TurboPumpPurgeValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveTurboPumpPurge}");
             _GuageValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveGuage}");
-            _LoadlockVentValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveLoadlockVent}");
-            _LoadlockPumpingValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveLoadlockPumping}");
+            //_LoadlockVentValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveLoadlockVent}");
+            //_LoadlockPumpingValve = DEVICE.GetDevice<IoValve>($"{Module}.{VenusDevice.ValveLoadlockPumping}");
             //_heMfc = DEVICE.GetDevice<IoMfc>($"{Module}.MfcHe");
             _ATM_sw = DEVICE.GetDevice<IoSensor>($"{Module}.SensorATMSwitch");
             _ATM_Loadlock_sw = DEVICE.GetDevice<IoSensor>($"{Module}.SensorLoadlockATMSwitch");
@@ -598,12 +596,12 @@ namespace Venus_RT.Devices
                 case ValveType.Guage:
                     _GuageValve.TurnValve(on, out _);
                     break;
-                case ValveType.LoadlockVent:
-                    _LoadlockVentValve.TurnValve(on, out _);
-                    break;
-                case ValveType.LoadlockPumping:
-                    _LoadlockPumpingValve.TurnValve(on, out _);
-                    break;
+                //case ValveType.LoadlockVent:
+                //    _LoadlockVentValve.TurnValve(on, out _);
+                //    break;
+                //case ValveType.LoadlockPumping:
+                //    _LoadlockPumpingValve.TurnValve(on, out _);
+                //    break;
                 case ValveType.Mfc1:
                     _Mfc1Valve.TurnValve(on, out _);
                     break;
@@ -671,62 +669,18 @@ namespace Venus_RT.Devices
 
         public override void Home()
         {
-            //if (_slitDoor.State == CylinderState.Open)
-            //{
-            //    SetSlitDoor(false, out _);
-            //}
             //2023/03/08添加
             OpenValve(ValveType.PVN22, true);
-        }
-
-
 
-        //public override bool SetSlitDoor(bool open, out string reason)
-        //{
-        //    if (open)
-        //    {
-        //        if (RouteManager.IsATMMode)
-        //        {
-        //            if (!IsATM)
-        //            {
-        //                reason = $"{Module} is not ATM, can not open slit door";
-        //                LOG.Write(eEvent.ERR_DEVICE_INFO, Module, reason);
-        //                return false;
-        //            }
-
-        //            if (!IsTMATM)
-        //            {
-        //                reason = $"LoadLock is not ATM, can not open slit door";
-        //                LOG.Write(eEvent.ERR_DEVICE_INFO, Module, reason);
-        //                return false;
-        //            }
-        //        }
-        //        else
-        //        {
-
-        //            double maxPressureDifference = SC.GetValue<double>("System.PMTMMaxPressureDifference");
-        //            if (Math.Abs(TMPressure - ChamberPressure) > maxPressureDifference)
-        //            {
-        //                reason = $"{Module} and TM pressure difference exceeds the max limit {maxPressureDifference}, TMPressure:{TMPressure}, {Module}Pressure:{ChamberPressure}";
-        //                LOG.Write(eEvent.ERR_DEVICE_INFO, Module, reason);
-        //                return false;
-        //            }
-        //        }
+            _Generator?.ReConnect();
+            _Match?.ReConnect();
+            _MainPump?.ReConnect();
+            _TurboPump?.ReConnect();
+            _pendulumValve?.ReConnect();
+            _RFBox?.ReConnect();
+        }
 
-        //    }
 
-        //    return _slitDoor.SetCylinder(open, out reason);
-        //}
-
-        //public override bool RetractWafer()
-        //{
-        //    return _LoadLockArm.SetCylinder(false, out _);
-        //}
-
-        //public override bool ExtendWafer()
-        //{
-        //    return _LoadLockArm.SetCylinder(true, out _);
-        //}
         public override bool FlowGas(int gasNum, double val)
         {
             if (_gasLines.Length <= gasNum)
@@ -836,32 +790,6 @@ namespace Venus_RT.Devices
             _RFBox.SetMatchPositionC1(c1, out _);
             return true;
         }
-        //public override bool GeneratorBiasPowerOn(bool on)
-        //{
-        //    if (_GeneratorBias == null) return false;
-
-        //    if (on && !IsRFGInterlockOn)
-        //    {
-        //        LOG.Write(eEvent.ERR_RF, Module, "Bias射频电源 Interlock条件不满足");
-        //        return false;
-        //    }
-
-        //    return _GeneratorBias.SetPowerOnOff(on, out _);
-        //}
-
-        //public override bool GeneratorBiasSetpower(float val)
-        //{
-        //    if (_GeneratorBias == null) return false;
-
-        //    if (Math.Abs(val) > 0.01)
-        //        _GeneratorBias.SetPower((ushort)val);
-        //    return true;
-        //}
-
-        //public override bool OnOffSetESCHV(bool val)
-        //{
-        //    return _ESCHV.SetPowerOnOff(val);
-        //}
 
         public override bool SetWallTCTemperature(float value)
         {

Venus/Venus_RT/Devices/PendulumValve.cs

@@ -601,5 +601,9 @@ namespace Venus_RT.Devices
 
             return true;
         }
+        public  bool ReConnect()
+        {
+            return _serial.ReConnect();
+        }
     }
 }

Venus/Venus_RT/Devices/RevtechMatch.cs

@@ -43,33 +43,6 @@ namespace Venus_RT.Devices
         private float c1SetPoint;
         private float c2SetPoint;
 
-
-        public override bool IsConnected
-        {
-            get
-            {
-                if (_matchCommunicationType == MatchCommunicationType.RS232)
-                {
-                    if (_serial.IsOpen() && System.IO.Ports.SerialPort.GetPortNames().Contains(_port.ToUpper()))
-                    {
-                        return true;
-                    }
-                    else
-                    {
-                        if (_serial.IsOpen())
-                        {
-                            _serial.Close();
-                        }
-                        return false;
-                    }
-                }
-                else if (_matchCommunicationType == MatchCommunicationType.Ethernet)
-                {
-                    return _socket.IsConnected;
-                }
-                return false;
-            }
-        }
         public new AITMatchData DeviceData =>
             new AITMatchData
             {
@@ -80,7 +53,7 @@ namespace Venus_RT.Devices
                 C2 = TunePosition2,
                 VPP = Vpp,
                 DCBias = DCBias.ToString(),
-                C1SetPoint=c1SetPoint,
+                C1SetPoint = c1SetPoint,
                 C2SetPoint = c2SetPoint,
             };
         public RevtechMatch(ModuleName mod, VenusDevice venusDevice, MatchCommunicationType matchCommunicationType) : base(mod.ToString(), venusDevice.ToString())
@@ -234,7 +207,7 @@ namespace Venus_RT.Devices
         }
         private void RevtechMatch_sendDataChangedEvent(string obj)
         {
-            if ((_matchCommunicationType == MatchCommunicationType.Ethernet)&&_socket.IsConnected)
+            if ((_matchCommunicationType == MatchCommunicationType.Ethernet) && _socket.IsConnected)
             {
                 byte[] value = Encoding.ASCII.GetBytes(obj);
 
@@ -304,23 +277,15 @@ namespace Venus_RT.Devices
 
         public override bool ReConnect()
         {
-            if (!IsConnected)
+            if (_matchCommunicationType == MatchCommunicationType.RS232)
             {
-                if (_matchCommunicationType == MatchCommunicationType.RS232)
-                {
-                    _serial.Open();
-                }
-                else if (_matchCommunicationType == MatchCommunicationType.Ethernet)
-                {
-                    _socket?.Connect(_address);
-                }
-                return IsConnected;
+              return  _serial.ReConnect();
             }
-            else
+            else if (_matchCommunicationType == MatchCommunicationType.Ethernet)
             {
-                return true;
+               return _socket.ReConnect();
             }
+            return false;
         }
-
     }
 }

Venus/Venus_RT/Devices/SMCChiller.cs

@@ -495,6 +495,9 @@ namespace Venus_RT.Devices
         {
             SendCmd(on ? SMCChillerMessage.SET_ON : SMCChillerMessage.SET_OFF);
         }
-
+        public override bool ReConnect()
+        {
+            return _serial.ReConnect();
+        }
     }
 }