分开所有系列配置文件

Venus/Framework/Common/SCCore/SystemConfigManager.cs

@@ -30,9 +30,9 @@ namespace MECF.Framework.Common.SCCore
         private string _scDataBackupFile = PathManager.GetCfgDir() + "_sc.data.bak";
         private string _scDataErrorFile = PathManager.GetCfgDir() + "_sc.data.err.";
  
-        public void Initialize(string scConfigPathName,PressureType pressureType)
+        public void Initialize(string scConfigPathName,ConfigType configType)
         {
-            if (pressureType == PressureType.mTorr)
+            if (configType == ConfigType.Other)
             {
                 _scDataFile = PathManager.GetCfgDir() + "_sc.data";
                 _scDataBackupFile = PathManager.GetCfgDir() + "_sc.data.bak";
@@ -40,9 +40,9 @@ namespace MECF.Framework.Common.SCCore
             }
             else
             {
-                _scDataFile = PathManager.GetCfgDir() + "_sc_Kepler2200.data";
-                _scDataBackupFile = PathManager.GetCfgDir() + "_sc.data_Kepler2200.bak";
-                //_scDataErrorFile = PathManager.GetCfgDir() + "_sc.data.err.";
+                _scDataFile = PathManager.GetCfgDir() + $"_sc_{configType}.data";
+                _scDataBackupFile = PathManager.GetCfgDir() + $"_sc.data_{configType}.bak";
+                //_scDataErrorFile = PathManager.GetCfgDir() + $"_sc.data.err._{configType}";
             }
             _scConfigFile =  scConfigPathName;
 

Venus/Venus_Core/ConfigType.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Venus_Core
+{
+    public enum ConfigType
+    {
+        Other,
+        Venus,
+        Kepler2300,
+        Kepler2200,
+        VenusSE,
+        VenusDE
+    }
+}

Venus/Venus_Core/Venus_Core.csproj

@@ -53,6 +53,7 @@
   <ItemGroup>
     <Compile Include="Attributes\IsOnlyReadAttribute.cs" />
     <Compile Include="Chamber.cs" />
+    <Compile Include="ConfigType.cs" />
     <Compile Include="ConvertPressureUnit.cs" />
     <Compile Include="DataName.cs" />
     <Compile Include="DeviceName.cs" />

Venus/Venus_RT/App.config

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

Venus/Venus_RT/Devices/IODevices/IoPressureMeter.cs

@@ -47,7 +47,7 @@ namespace Venus_RT.Devices.IODevices
                 byte[] low = BitConverter.GetBytes(_ai.Buffer[_ai.Index + 1]);
                 float pressure = BitConverter.ToSingle(new[] { high[0], high[1], low[0], low[1] }, 0);
 
-                if (RtInstance.pressureType==PressureType.Pa)
+                if (RtInstance.ConfigType==ConfigType.Kepler2200)
                 {
                     return ConvertPressureUnit.ConvertmTorrToPa(pressure);
                 }

Venus/Venus_RT/Instances/RtInstance.cs

@@ -34,7 +34,9 @@ namespace Venus_RT.Modules
         public const string DeviceModelFileName_SE = "DeviceModelVenusSE_MF.xml";
         private ImageSource _trayIcon;
         private IRtLoader _loader;
-        public static PressureType pressureType = (PressureType) Convert.ToInt32(System.Configuration.ConfigurationManager.ConnectionStrings["PressureType"].ConnectionString);
+        //public static PressureType pressureType = (PressureType) Convert.ToInt32(System.Configuration.ConfigurationManager.ConnectionStrings["PressureType"].ConnectionString);
+        public static ConfigType ConfigType = (ConfigType)Convert.ToInt32(System.Configuration.ConfigurationManager.ConnectionStrings["ConfigType"].ConnectionString);
+
         public RtInstance()
         {
             _trayIcon = new BitmapImage(new Uri("pack://application:,,,/Venus_RT;component/defaultrt.ico"));

Venus/Venus_RT/Instances/ToolLoader.cs

@@ -56,16 +56,18 @@ namespace Venus_RT.Instances
             Singleton<OperationManager>.Instance.Initialize();
 
             Singleton<DataManager>.Instance.Initialize();
-            
-            if (RtInstance.pressureType == PressureType.mTorr)
-            {
-                Singleton<SystemConfigManager>.Instance.Initialize(PathManager.GetCfgDir() + "System.sccfg", PressureType.mTorr);
-            }
-            else
+
+
+            PressureType pressureType = PressureType.mTorr;
+
+            if (RtInstance.ConfigType == ConfigType.Kepler2200)
             {
-                Singleton<SystemConfigManager>.Instance.Initialize(PathManager.GetCfgDir() + "System_Kepler2200.sccfg", PressureType.Pa);
+                pressureType = PressureType.Pa;
             }
 
+            Singleton<SystemConfigManager>.Instance.Initialize(PathManager.GetCfgDir() + $"System_{RtInstance.ConfigType}.sccfg", RtInstance.ConfigType);
+
+
             RecipeFileManager.Instance.Initialize(new VenusRecipeFileContext(), new VenusSequenceFileContext(), true);
 
             IoProviderManager.Instance.Initialize(PathManager.GetCfgDir() + "IoProviderConfig.xml");
@@ -76,7 +78,7 @@ namespace Venus_RT.Instances
             WaferManager.Instance.Initialize();
 
             AccountExManager.Instance.Initialize(true);
-       
+
             Singleton<DeviceManager>.Instance.Initialize();
 
             Singleton<DeviceEntity>.Instance.Initialize();
@@ -98,7 +100,7 @@ namespace Venus_RT.Instances
             string s1 = System.Diagnostics.FileVersionInfo.GetVersionInfo(Path.Combine(PathManager.GetAppDir(), "Venus_RT.exe")).ProductVersion;
 
             DATA.Subscribe("GetRTPath", () => AppDomain.CurrentDomain.BaseDirectory);
-            DATA.Subscribe("System.PressureUnitType", () => (int)RtInstance.pressureType,SubscriptionAttribute.FLAG.IgnoreSaveDB);
+            DATA.Subscribe("System.PressureUnitType", () => (int)pressureType, SubscriptionAttribute.FLAG.IgnoreSaveDB);
 
 
             Singleton<ResourceMonitor>.Instance.Initialize();

Venus/Venus_RT/Venus_RT.csproj

@@ -456,7 +456,7 @@
     <Content Include="Config\SignalTower.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Config\System.sccfg">
+    <Content Include="Config\System_Kepler2300.sccfg">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <None Include="Config\DeviceModel.xsd">
@@ -469,6 +469,18 @@
     <Content Include="Config\System_Kepler2200.sccfg">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Config\System.sccfg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Config\System_Venus.sccfg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Config\System_VenusSE.sccfg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Config\System_VenusDE.sccfg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

Venus/Venus_Simulator/Instances/SystemConfig.cs

@@ -42,10 +42,10 @@ namespace Venus_Simulator.Instances
             int nIndesx = current_path.LastIndexOf("Venus\\");
             current_path = current_path.Substring(0, nIndesx + 5);
             string rtConfigPath = current_path + "\\Venus_RT\\bin\\Debug\\Venus_RT.exe.config";
-            var pressureType=GetConfig(rtConfigPath).ConnectionStrings.ConnectionStrings["PressureType"].ConnectionString;
-            if (pressureType == "1")
+            var configType=GetConfig(rtConfigPath).ConnectionStrings.ConnectionStrings["ConfigType"].ConnectionString;
+            if (configType != "0")
             {
-                pathName = "_Kepler2200";
+                pathName = $"_{configType}";
             }