1.增加瑞凡RF

VirgoRT/Config/System.sccfg

@@ -195,7 +195,7 @@
 			<config default="20" name="ChamberForelinePressureTimeout" nameView="Chamber Foreline Pressure Timeout" description="" max="3000" min="0" paramter="" tag="" unit="s" type="Integer" />
 		</configs>
 		<configs name="Rf" nameView="Source RF" >
-			<config default="1" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
+			<config default="1" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet;3:RAFE" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="1" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="COM14" name="Port" nameView="Port" description="serial port name of RFG" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="192.168.10.21:502" name="IPAddress" nameView="IP Address" description="EFEM IP,default 127.0.0.1:502" max="" min="" paramter="" tag="" unit="" type="String" />
@@ -227,7 +227,7 @@
     </configs>
 		<configs name="match" nameView="Source Match" >
 			<config default="false" name="EnableMatch" nameView="Enable Source Match" description="enable match or not" max="1" min="0" tag="" unit="" type="Bool" />
-			<config default="1" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet;3:Revtech" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
+			<config default="1" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet;3:RAFE" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="1" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="COM15" name="Port" nameView="Port" description="serial port name of match" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="192.168.10.21:502" name="IPAddress" nameView="IP Address" description="EFEM IP,default 127.0.0.1:502" max="" min="" paramter="" tag="" unit="" type="String" />
@@ -269,7 +269,7 @@
 		</configs>
 		<configs name="BiasMatch" nameView="Bias Match" >
 			<config default="false" name="EnableBiasMatch" nameView="Enable Bias Match" description="enable bias match or not" max="1" min="0" tag="" unit="" type="Bool" />
-			<config default="2" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet;3:Revtech" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
+			<config default="2" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet;3:RAFE" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="2" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="COM15" name="Port" nameView="Port" description="serial port name of match" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="127.0.0.1:502" name="IPAddress" nameView="IP Address" description="EFEM IP,default 127.0.0.1:502" max="" min="" paramter="" tag="" unit="" type="String" />
@@ -580,7 +580,7 @@
 			<config default="20" name="ChamberForelinePressureTimeout" nameView="Chamber Foreline Pressure Timeout" description="" max="3000" min="0" paramter="" tag="" unit="s" type="Integer" />
 		</configs>
 		<configs name="Rf" nameView="Source RF" >
-			<config default="1" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
+			<config default="1" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet;3:RAFE" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="1" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="COM24" name="Port" nameView="Port" description="serial port name of RFG" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="127.0.0.1:502" name="IPAddress" nameView="IP Address" description="EFEM IP,default 127.0.0.1:502" max="" min="" paramter="" tag="" unit="" type="String" />
@@ -611,7 +611,7 @@
 		</configs>
 		<configs name="match" nameView="Source Match" >
 			<config default="false" name="EnableMatch" nameView="Enable Source Match" description="enable match or not" max="1" min="0" tag="" unit="" type="Bool" />
-			<config default="1" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet;3:Revtech" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
+			<config default="1" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet;3:RAFE" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="1" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="COM25" name="Port" nameView="Port" description="serial port name of match" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="127.0.0.1:502" name="IPAddress" nameView="IP Address" description="EFEM IP,default 127.0.0.1:502" max="" min="" paramter="" tag="" unit="" type="String" />
@@ -652,7 +652,7 @@
 		</configs>
 		<configs name="BiasMatch" nameView="Bias Match" >
 			<config default="false" name="EnableBiasMatch" nameView="Enable Bias Match" description="enable bias match or not" max="1" min="0" tag="" unit="" type="Bool" />
-			<config default="2" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet;3:Revtech" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
+			<config default="2" name="MFG" nameView="MFG" description="厂商, 1:AdTec; 2:Comet;3:RAFE" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="2" name="CommunicationType" nameView="Communication Type" description="0:Analogue; 1:RS232; 2:Ethernet" max="10" min="0" paramter="" tag="" unit="" type="Integer" />
 			<config default="COM15" name="Port" nameView="Port" description="serial port name of match" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="192.168.10.22:502" name="IPAddress" nameView="IP Address" description="EFEM IP,default 127.0.0.1:502" max="" min="" paramter="" tag="" unit="" type="String" />

VirgoRT/Devices/DataDefine.cs

@@ -150,7 +150,8 @@ namespace VirgoRT
     public enum GeneratorMFG
     {
         AdTec = 1,
-        Comet = 2
+        Comet = 2,
+        Revtech = 3,
     }
 
     public enum MatchMFG

VirgoRT/Devices/DeviceManager.cs

@@ -50,10 +50,16 @@ namespace VirgoRT.Instances
         {
             Initialize(device_model_file, RtInstance.SystemName, mod, mod.ToString());
 
-            if (SC.GetValue<int>($"{mod}.Rf.CommunicationType") == (int)CommunicationType.RS232 &&
-                SC.GetValue<int>($"{mod}.Rf.MFG") == (int)GeneratorMFG.AdTec)
+            if (SC.GetValue<int>($"{mod}.Rf.CommunicationType") == (int)CommunicationType.RS232)
             {
-                AddCustomModuleDevice(new AdTecGenerator(mod, "Rf"));
+                if(SC.GetValue<int>($"{mod}.Rf.MFG") == (int)GeneratorMFG.AdTec)
+                {
+                    AddCustomModuleDevice(new AdTecGenerator(mod, "Rf"));
+                }
+                else if (SC.GetValue<int>($"{mod}.Rf.MFG") == (int)GeneratorMFG.Revtech)
+                {
+                    AddCustomModuleDevice(new RevtechGenerator(mod, "Rf"));
+                }
             }
 
             if (SC.GetValue<bool>($"{mod}.BiasRf.EnableBiasRF") &&

VirgoRT/Devices/JetPM.cs

@@ -338,10 +338,16 @@ namespace VirgoRT.Devices
             _gridHeater.Controller = (IoHeaterController)_gridChiller;
 
             // RS223 AdTec Generator
-            if (SC.GetValue<int>($"{mod}.Rf.CommunicationType") == (int)CommunicationType.RS232 &&
-                SC.GetValue<int>($"{mod}.Rf.MFG") == (int)GeneratorMFG.AdTec)
+            if (SC.GetValue<int>($"{mod}.Rf.CommunicationType") == (int)CommunicationType.RS232)
             {
-                _Generator = DEVICE.GetDevice<AdTecGenerator>($"{Module}.{VirgoDevice.Rf}");
+                if(SC.GetValue<int>($"{mod}.Rf.MFG") == (int)GeneratorMFG.AdTec)
+                {
+                    _Generator = DEVICE.GetDevice<AdTecGenerator>($"{Module}.{VirgoDevice.Rf}");
+                }
+                else if (SC.GetValue<int>($"{mod}.Rf.MFG") == (int)GeneratorMFG.Revtech)
+                {
+                    _Generator = DEVICE.GetDevice<RevtechGenerator>($"{Module}.{VirgoDevice.Rf}");
+                }
             }
 
             if (SC.GetValue<int>($"{mod}.DryPump.MFG") == (int)DryPumpMFG.Kashiyama)

VirgoRT/Modules/RouteManager.cs

@@ -234,7 +234,6 @@ namespace VirgoRT.Modules
             DATA.Subscribe("System.IsIdle", () => IsIdle || IsInit || IsAutoIdle);
             DATA.Subscribe("System.IsAutoIdle", () => IsAutoIdle, SubscriptionAttribute.FLAG.IgnoreSaveDB);
             DATA.Subscribe("System.IsAlarm", () => IsAlarm || IsEntityError);
-            DATA.Subscribe("System.IsAlarm", () => IsAlarm || IsEntityError);
             DATA.Subscribe("System.IsBusy", () => IsRunning);
             DATA.Subscribe("System.IsWaitUnload", () => _isWaitUnload && IsAutoMode);
             DATA.Subscribe("System.IsConnectedWithHost", () => Singleton<FaManager>.Instance.IsConnected);

VirgoRT/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.7")]
+[assembly: AssemblyVersion("2.0.0.8")]
 //[assembly: AssemblyFileVersion("1.0.4")]

VirgoRT/ReleaseNotes.txt

@@ -4,6 +4,9 @@
 					 VirgoST 系统更新历史记录
 
 ---------------------------------------------------------------------------------
+2025-04-17 version 2.0.0.8
+1.增加瑞凡RF
+
 2025-04-07 version 2.0.0.7
 1.增加瑞凡match，支持网口和串口
 2.增加Signal tower config界面

VirgoRT/VirgoRT.csproj

@@ -129,6 +129,7 @@
     <Compile Include="Devices\JetPM.cs" />
     <Compile Include="Devices\KashiyamaPump.cs" />
     <Compile Include="Devices\PlasmaController.cs" />
+    <Compile Include="Devices\RevtechGenerator.cs" />
     <Compile Include="Devices\RevtechMatch.cs" />
     <Compile Include="Devices\SkyPump.cs" />
     <Compile Include="Devices\SMCChiller.cs" />

VirgoUI/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.7")]
+[assembly: AssemblyVersion("2.0.0.8")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]