Pārlūkot izejas kodu

删除不需要的IO等

JET-YDB\JET-YANGDB 3 nedēļas atpakaļ
vecāks
revīzija
60af2eb36b

+ 1 - 1
Framework/Common/Device/Unit/IoSensor.cs

@@ -92,7 +92,7 @@ namespace Aitex.Core.RT.Device.Unit
         {
             try
             {
-                if (Name == "SensorCDAPressureOk2" && SC.GetValue<bool>("System.IsIgnoreCDAPressure2Alarm")) return;
+                //if (Name == "SensorCDAPressureOk2" && SC.GetValue<bool>("System.IsIgnoreCDAPressure2Alarm")) return;
                 _trigTextOut.CLK = (Value == _textOutTrigValue);
 
                 if (_trigTextOut.Q)

+ 29 - 2
Framework/SimulatorCore/Commons/DeviceSimulator.cs

@@ -1,4 +1,5 @@
-using System;
+using Aitex.Core.Util;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -28,11 +29,36 @@ namespace MECF.Framework.Simulator.Core.Driver
         protected char _msgDelimiter;
         protected int _commandIndex;
 
+        private FixSizeQueue<string> _lstAsciiMsgs = new FixSizeQueue<string>(1000);
+        private FixSizeQueue<byte[]> _lstBinMsgs = new FixSizeQueue<byte[]>(1000);
+        private PeriodicJob _thread;
+
         public DeviceSimulator(int commandIndex, string lindDelimiter, char msgDelimiter)
         {
              _lineDelimiter = lindDelimiter;
             _msgDelimiter = msgDelimiter;
             _commandIndex = commandIndex;
+            _thread = new PeriodicJob(100, MonitorMessages, "Monitor Messages Thread", true);
+        }
+
+        private bool MonitorMessages()
+        {
+            try
+            {
+                string asciimsg;
+                while (_lstAsciiMsgs.TryDequeue(out asciimsg))
+                {
+                    ProcessUnsplitMessage(asciimsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Trace.WriteLine(ex);
+            }
+
+            return true;
+
+
         }
 
         protected virtual void AddCommandHandler(string command, Action<string> handler)
@@ -62,7 +88,8 @@ namespace MECF.Framework.Simulator.Core.Driver
 
             if (_commandIndex < 0)
             {
-                ProcessUnsplitMessage(message);
+                _lstAsciiMsgs.Enqueue(message);
+                //ProcessUnsplitMessage(message);
                 return;
             }
 

BIN
VirgoRT/Config/DeviceModelVirgo.xml


BIN
VirgoRT/Config/Interlock.Virgo.xml


+ 33 - 33
VirgoRT/Config/_ioDefineVirgo.xml

@@ -5,7 +5,7 @@
 		<DI_ITEM Index="1" Name="DI_PM_ATM_SW" Device="" Addr="w20.01" Note="Interlock-PLC" />
 		<DI_ITEM Index="2" Name="DI_PM_VAC_SW" Device="9.5T" Addr="w20.02" Note="Interlock-HW" />
 		<DI_ITEM Index="3" Name="DI_Cooling_Water_Flow_SW" Device="" Addr="w20.03" Note="Interlock-HW" />
-    <DI_ITEM Index="4" Name="DI_LE_OT_SW_Alarm" Device="" Addr="w20.04" Note="1=OK, 0=alarm" />
+    <!--<DI_ITEM Index="4" Name="DI_LE_OT_SW_Alarm" Device="" Addr="w20.04" Note="1=OK, 0=alarm" />-->
 		<DI_ITEM Index="5" Name="DI_Water_Leak" Device="" Addr="w20.05" Note="1=OK, 0=alarm" />
 		<DI_ITEM Index="6" Name="DI_Slit_Door_Open_Pos" Device="" Addr="w20.06" Note="Interlock-HW" />
 		<DI_ITEM Index="7" Name="DI_Slit_Door_Close_Pos" Device="" Addr="w20.07" Note="Interlock-HW" />
@@ -23,16 +23,16 @@
 		<DI_ITEM Index="19" Name="DI_Substrate_Control_TC_Broken_Alarm" Device="" Addr="w21.03" Note="0=OK,1=alarm" />
 		<DI_ITEM Index="20" Name="DI_Substrate_Monitor_TC_Broken_Alarm" Device="" Addr="w21.04" Note="0=OK,1=alarm" />
 		<DI_ITEM Index="21" Name="DI_Substrate_Heater_On_FB" Device="" Addr="w21.05" Note="0=OFF,1=ON" />
-		<DI_ITEM Index="22" Name="DI_CDA_Pressure" Device="" Addr="w21.06" />
-		<DI_ITEM Index="23" Name="DI_CDA_Pressure_Switch_Out_2" Device="" Addr="W21.07" />
+		<DI_ITEM Index="22" Name="DI_CDA_Pressure_Switch_Out_1" Device="" Addr="w21.06" />
+		<!--<DI_ITEM Index="23" Name="DI_CDA_Pressure_Switch_Out_2" Device="" Addr="W21.07" />-->
 		<DI_ITEM Index="24" Name="DI_SourceFan1" Device="" Addr="w21.08" />
 		<DI_ITEM Index="25" Name="DI_CTRL_Box_Fans_Running" Device="" Addr="W21.09" />
 		<DI_ITEM Index="26" Name="DI_Source_Match_Interlock" Device="" Addr="W21.10"/>
 		<DI_ITEM Index="27" Name="DI_Bais_Match_Interlock" Device="" Addr="W21.11"/>
 		<DI_ITEM Index="28" Name="" />
-    <DI_ITEM Index="29" Name="DI_GB_Interlock_Alarm" Device="" Addr="w21.13" Note="0=OK,1=Warning" />
+    <DI_ITEM Index="29" Name="DI_GB_Door_Interlock" Device="" Addr="w21.13" Note="0=OK,1=Warning" />
     <DI_ITEM Index="30" Name="DI_GB_Pressure_Interlock" Device="" Addr="W21.14" />
-    <DI_ITEM Index="31" Name="DI_CHB_Wall_OT_Switch_Alarm" Device="" Addr="W21.15"/>
+    <!--<DI_ITEM Index="31" Name="DI_CHB_Wall_OT_Switch_Alarm" Device="" Addr="W21.15"/>-->
     <DI_ITEM Index="32" Name="DI_SRF_Water_Flow_Switch" Device="" Addr="W22.00" />
     <DI_ITEM Index="33" Name="DI_Factory_Scrubber_SYS_Normal" Device="" Addr="W22.01" />
     <DI_ITEM Index="34" Name="" />
@@ -55,9 +55,9 @@
 		<DI_ITEM Index="51" Name="DI_MFC4_Pressure" Device="" Addr="w23.03" />
 		<DI_ITEM Index="52" Name="DI_MFC5_Pressure" Device="" Addr="w23.04" />
     <DI_ITEM Index="53" Name="DI_N2_Pressure" Device="" Addr="w23.05"  />
-    <DI_ITEM Index="54" Name="DI_Process_pressure_Alarm" Addr="w23.06" />
-    <DI_ITEM Index="55" Name="DI_Chamber_pressure_Alarm" Addr="w23.07" />
-    <DI_ITEM Index="56" Name="DI_Foreline_pressure_Alarm" Addr="w23.08" />
+    <!--<DI_ITEM Index="54" Name="DI_Process_pressure_Alarm" Addr="w23.06" />-->
+    <!--<DI_ITEM Index="55" Name="DI_Chamber_pressure_Alarm" Addr="w23.07" />-->
+    <!--<DI_ITEM Index="56" Name="DI_Foreline_pressure_Alarm" Addr="w23.08" />-->
 		<DI_ITEM Index="57" Name="" />
 		<DI_ITEM Index="58" Name="" />
 		<DI_ITEM Index="59" Name="" />
@@ -69,7 +69,7 @@
 		<DI_ITEM Index="65" Name="" />
 		<DI_ITEM Index="66" Name="" />
 		<DI_ITEM Index="67" Name="DI_CHB_Wall_TC_Deviation_out_of_range" Addr="w24.03" />
-		<DI_ITEM Index="68" Name="DI_Grid_TC_Broken_Alarm" Addr="w24.04"/>
+		<!--<DI_ITEM Index="68" Name="DI_Grid_TC_Broken_Alarm" Addr="w24.04"/>-->
 		<DI_ITEM Index="69" Name="DI_CHB_Wall_Control_TC_Broken_Alarm" Addr="w24.05"/>
 		<DI_ITEM Index="70" Name="DI_CHB_Wall_Monitor_TC_Broken_Alarm" Addr="w24.06"/>
 		<DI_ITEM Index="71" Name="DI_CHB_Wall_Heater_On_FB" Addr="w24.07" />
@@ -105,9 +105,9 @@
     <DI_ITEM Index="101" Name="DI_Lift_Servo_Origin_Sensor" Addr="W26.05" Device=""  Note="1=On,0=Off    Lift Servo 原点开关(NO)" />
     <DI_ITEM Index="102" Name="DI_Lift_Servo_Up_Limit_Sensor" Addr="W26.06" Device=""  Note="1=On,0=Off    Lift Servo 上极限开关(NC)" />
     <DI_ITEM Index="103" Name="DI_Lift_Servo_Down_Limit_Sensor" Addr="W26.07" Device=""  Note="1=On,0=Off    Lift Servo 下极限开关(NC)" />
-    <DI_ITEM Index="104" Name="DI_Lift_Virtual_Servo_On" Addr="W26.08" Device=""  Note="1=On,0=Off    虚拟轴伺服On" />
-    <DI_ITEM Index="105" Name="DI_Lift_Virtual_Servo_Origin_Complete" Addr="W26.09" Device=""  Note="1=On,0=Off    虚拟轴伺服回原点完成" />
-    <DI_ITEM Index="106" Name="DI_Lift_Virtual_Servo_Busying" Addr="W26.10" Device=""  Note="1=On,0=Off    虚拟轴伺服运行中" />
+    <!--<DI_ITEM Index="104" Name="DI_Lift_Virtual_Servo_On" Addr="W26.08" Device=""  Note="1=On,0=Off    虚拟轴伺服On" />-->
+    <!--<DI_ITEM Index="105" Name="DI_Lift_Virtual_Servo_Origin_Complete" Addr="W26.09" Device=""  Note="1=On,0=Off    虚拟轴伺服回原点完成" />-->
+    <!--<DI_ITEM Index="106" Name="DI_Lift_Virtual_Servo_Busying" Addr="W26.10" Device=""  Note="1=On,0=Off    虚拟轴伺服运行中" />-->
     <DI_ITEM Index="107" Name="DI_Lift_Servo_Group_Go_Pos_1_Complete" Addr="W26.11" Device="" />
     <DI_ITEM Index="108" Name="DI_Lift_Servo_Group_Go_Pos_2_Complete" Addr="W26.12" Device="" />
     <DI_ITEM Index="109" Name="DI_Lift_Servo_Group_Go_Pos_3_Complete" Addr="W26.13" Device="" />
@@ -117,7 +117,7 @@
     <DI_ITEM Index="113" Name="" />
     <DI_ITEM Index="114" Name="DI_Lift_Servo_1_Servo_On" Addr="W27.02" Device=""  Note="1=On,0=Off    伺服-1ON" />
     <DI_ITEM Index="115" Name="DI_Lift_Servo_1_Servo_Origin_Complete" Addr="W27.03" Device=""  Note="1=On,0=Off    伺服-1回原点完成" />
-    <DI_ITEM Index="116" Name="DI_Lift_Servo_1_Servo_Busying" Addr="W27.04" Device=""  Note="1=On,0=Off    伺服-1伺服运行中" />
+    <!--<DI_ITEM Index="116" Name="DI_Lift_Servo_1_Servo_Busying" Addr="W27.04" Device=""  Note="1=On,0=Off    伺服-1伺服运行中" />-->
     <DI_ITEM Index="117" Name="DI_Lift_Servo_1_Braker_Open" Addr="W27.05" Device=""  Note="1=On,0=Off    伺服-1抱闸已打开" />
     <DI_ITEM Index="118" Name="DI_Lift_Servo_1_L_Servo_Driver_Alarm" Addr="W27.06" Device=""  Note="0=Normal, 1=Alarm  伺服驱动-1器报警" />
     <DI_ITEM Index="119" Name="DI_Lift_Servo_1_L_Servo_Driver_Warning" Addr="W27.07" Device=""  Note="0=Normal, 1=Alarm  伺服驱动-1器警告" />
@@ -133,7 +133,7 @@
     <DI_ITEM Index="129" Name="" />
     <DI_ITEM Index="130" Name="DI_Lift_Servo_2_Servo_On" Addr="W28.02" Device=""  Note="1=On,0=Off    伺服-1ON" />
     <DI_ITEM Index="131" Name="DI_Lift_Servo_2_Servo_Origin_Complete" Addr="W28.03" Device=""  Note="1=On,0=Off    伺服-1回原点完成" />
-    <DI_ITEM Index="132" Name="DI_Lift_Servo_2_Servo_Busying" Addr="W28.04" Device=""  Note="1=On,0=Off    伺服-1伺服运行中" />
+    <!--<DI_ITEM Index="132" Name="DI_Lift_Servo_2_Servo_Busying" Addr="W28.04" Device=""  Note="1=On,0=Off    伺服-1伺服运行中" />-->
     <DI_ITEM Index="133" Name="DI_Lift_Servo_2_Braker_Open" Addr="W28.05" Device=""  Note="1=On,0=Off    伺服-1抱闸已打开" />
     <DI_ITEM Index="134" Name="DI_Lift_Servo_2_L_Servo_Driver_Alarm" Addr="W28.06" Device=""  Note="0=Normal, 1=Alarm  伺服驱动-1器报警" />
     <DI_ITEM Index="135" Name="DI_Lift_Servo_2_L_Servo_Driver_Warning" Addr="W28.07" Device=""  Note="0=Normal, 1=Alarm  伺服驱动-1器警告" />
@@ -215,7 +215,7 @@
 		<DO_ITEM Index="49" Name="" />
 		<DO_ITEM Index="50" Name="" />
 		<DO_ITEM Index="51" Name="" />
-		<DO_ITEM Index="52" Name="DO_Arm_Extend_Enable" Addr="w3.04" Note="允许EFEM Rorbot Arm伸入PM腔体内,带逻辑"/>
+		<!--<DO_ITEM Index="52" Name="DO_Arm_Extend_Enable" Addr="w3.04" Note="允许EFEM Rorbot Arm伸入PM腔体内,带逻辑"/>-->
 		<DO_ITEM Index="53" Name="" />
 		<DO_ITEM Index="54" Name="" />
 		<DO_ITEM Index="55" Name="" />
@@ -259,11 +259,11 @@
     <DO_ITEM Index="93" Name="" />
     <DO_ITEM Index="94" Name="" />
     <DO_ITEM Index="95" Name="" />
-    <DO_ITEM Index="96" Name="DO_Lift_Servo-1_Manual_Up" Addr="W6.00" Device="" />
-    <DO_ITEM Index="97" Name="DO_Lift_Servo-1_Manual_Down" Addr="W6.01" Device="" />
-    <DO_ITEM Index="98" Name="DO_Lift_Servo-1_Stop" Addr="W6.02" Device="" />
-    <DO_ITEM Index="99" Name="DO_Lift_Servo-1_Step_Up" Addr="W6.03" Device="" />
-    <DO_ITEM Index="100" Name="DO_Lift_Servo-1_Step_Down" Addr="W6.04" Device="" />
+    <!--<DO_ITEM Index="96" Name="DO_Lift_Servo-1_Manual_Up" Addr="W6.00" Device="" />-->
+    <!--<DO_ITEM Index="97" Name="DO_Lift_Servo-1_Manual_Down" Addr="W6.01" Device="" />-->
+    <!--<DO_ITEM Index="98" Name="DO_Lift_Servo-1_Stop" Addr="W6.02" Device="" />-->
+    <!--<DO_ITEM Index="99" Name="DO_Lift_Servo-1_Step_Up" Addr="W6.03" Device="" />-->
+    <!--<DO_ITEM Index="100" Name="DO_Lift_Servo-1_Step_Down" Addr="W6.04" Device="" />-->
     <DO_ITEM Index="101" Name="" />
     <DO_ITEM Index="102" Name="" />
     <DO_ITEM Index="103" Name="" />
@@ -275,11 +275,11 @@
     <DO_ITEM Index="109" Name="" />
     <DO_ITEM Index="110" Name="" />
     <DO_ITEM Index="111" Name="" />
-    <DO_ITEM Index="112" Name="DO_Lift_Servo-2_Manual_Up" Addr="W7.00" Device="" />
-    <DO_ITEM Index="113" Name="DO_Lift_Servo-2_Manual_Down" Addr="W7.01" Device="" />
-    <DO_ITEM Index="114" Name="DO_Lift_Servo-2_Stop" Addr="W7.02" Device="" />
-    <DO_ITEM Index="115" Name="DO_Lift_Servo-2_Step_Up" Addr="W7.03" Device="" />
-    <DO_ITEM Index="116" Name="DO_Lift_Servo-2_Step_Down" Addr="W7.04" Device="" />
+    <!--<DO_ITEM Index="112" Name="DO_Lift_Servo-2_Manual_Up" Addr="W7.00" Device="" />-->
+    <!--<DO_ITEM Index="113" Name="DO_Lift_Servo-2_Manual_Down" Addr="W7.01" Device="" />-->
+    <!--<DO_ITEM Index="114" Name="DO_Lift_Servo-2_Stop" Addr="W7.02" Device="" />-->
+    <!--<DO_ITEM Index="115" Name="DO_Lift_Servo-2_Step_Up" Addr="W7.03" Device="" />-->
+    <!--<DO_ITEM Index="116" Name="DO_Lift_Servo-2_Step_Down" Addr="W7.04" Device="" />-->
     <DO_ITEM Index="117" Name="" />
     <DO_ITEM Index="118" Name="" />
     <DO_ITEM Index="119" Name="" />
@@ -335,7 +335,7 @@
 		<AO_ITEM Index="23" Name="" />
 		<AO_ITEM Index="24" Name="" />
 		<AO_ITEM Index="25" Name="AO_BaisRF_Enable" BufferOffset="50" Device="" Addr="d1050" Note="0=Substrate heater mode ,1=Bais RF mode" />
-		<AO_ITEM Index="26" Name="AO_Grid_TC_Enable" BufferOffset="52" Device=""  Addr="d1052" Note="1=Grid TC"/>
+		<!--<AO_ITEM Index="26" Name="AO_Grid_TC_Enable" BufferOffset="52" Device=""  Addr="d1052" Note="1=Grid TC"/>-->
 		<AO_ITEM Index="27" Name="" />
 		<AO_ITEM Index="28" Name="" BufferOffset="56" Device=""  Addr="d1056" Note="mm/s"/>
 		<AO_ITEM Index="29" Name="" BufferOffset="58" Device=""  Addr="d1058" Note="mm/s" />
@@ -354,7 +354,7 @@
 		<AO_ITEM Index="42" Name="" />
 		<AO_ITEM Index="43" Name="" />
 		<AO_ITEM Index="44" Name="" />
-    <AO_ITEM Index="45" Name="AO_Lift_Servo_Work_Mode" Addr="D1090" Device="" />
+    <!--<AO_ITEM Index="45" Name="AO_Lift_Servo_Work_Mode" Addr="D1090" Device="" />-->
     <AO_ITEM Index="46" Name="AO_Lift_Servo_Group_ABS_POS_Diff" Addr="D1092" Device="" />
     <AO_ITEM Index="47" Name="" />
     <AO_ITEM Index="48" Name="" />
@@ -371,7 +371,7 @@
     <AO_ITEM Index="59" Name="AO_Lift_Servo_Group_Manual_Speed" Addr="D1118" Device=""  Note="UI" />
     <AO_ITEM Index="60" Name="AO_Lift_Servo_Group_Soft_Up_Limit" Addr="D1120" Device=""  Note="RT" />
     <AO_ITEM Index="61" Name="AO_Lift_Servo_Group_soft_Down_Limit" Addr="D1122" Device="" />
-    <AO_ITEM Index="62" Name="AO_Lift_Servo_Group_ACC_DEC_Speed_Time" Addr="D1124" Device="" />
+    <!--<AO_ITEM Index="62" Name="AO_Lift_Servo_Group_ACC_DEC_Speed_Time" Addr="D1124" Device="" />-->
     <AO_ITEM Index="63" Name="" />
     <AO_ITEM Index="64" Name="" />
     <AO_ITEM Index="65" Name="" />
@@ -396,8 +396,8 @@
 		<AI_ITEM Index="6" Name="AI_MFC3_Flow" BufferOffset="12" Device="" Addr="d2012" Note="MFC" />
 		<AI_ITEM Index="7" Name="AI_MFC4_Flow" BufferOffset="14" Device="" Addr="d2014" Note="MFC" />
 		<AI_ITEM Index="8" Name="AI_MFC5_Flow" BufferOffset="16" Device="" Addr="d2016" Note="MFC" />
-    <AI_ITEM Index="9" Name="AI_Coolant_Inlet_Temp" BufferOffset="18" Device="" Addr="d2018" Note="Chiller" />
-    <AI_ITEM Index="10" Name="AI_Coolant_Outlet_Temp" BufferOffset="20" Device="" Addr="d2020" Note="Chiller" />
+    <!--<AI_ITEM Index="9" Name="AI_Coolant_Inlet_Temp" BufferOffset="18" Device="" Addr="d2018" Note="Chiller" />-->
+    <!--<AI_ITEM Index="10" Name="AI_Coolant_Outlet_Temp" BufferOffset="20" Device="" Addr="d2020" Note="Chiller" />-->
 		<AI_ITEM Index="11" Name="AI_Substrate_Control_TC_Temp" BufferOffset="22" Device="" Addr="d2022" Note="TC temp" />
 		<AI_ITEM Index="12" Name="AI_Substrate_Monitor_TC_Temp" BufferOffset="24" Device="" Addr="d2024" Note="TC temp" />
 		<AI_ITEM Index="13" Name="" />
@@ -422,7 +422,7 @@
 		<AI_ITEM Index="32" Name="" />
 		<AI_ITEM Index="33" Name="" />
 		<AI_ITEM Index="34" Name="" />
-    <AI_ITEM Index="35" Name="AI_Grid_TC_Temp" BufferOffset="70" Device="" Addr="d2070" Note="TC temp" />
+    <!--<AI_ITEM Index="35" Name="AI_Grid_TC_Temp" BufferOffset="70" Device="" Addr="d2070" Note="TC temp" />-->
     <AI_ITEM Index="36" Name="AI_CHB_Wall_Control_TC_Temp" BufferOffset="72" Device="" Addr="d2072" Note="TC temp" />
     <AI_ITEM Index="37" Name="AI_CHB_Wall_Monitor_TC_Temp" BufferOffset="74" Device="" Addr="d2074" Note="TC temp" />
 		<AI_ITEM Index="38" Name="" />
@@ -432,12 +432,12 @@
 		<AI_ITEM Index="42" Name="" BufferOffset="84" Device="" Addr="d2084" Note="ICP Souce/RPS" />
 		<AI_ITEM Index="43" Name="" BufferOffset="86" Device="" Addr="d2086" />
 		<AI_ITEM Index="44" Name="" />
-    <AI_ITEM Index="45" Name="AI_Lift_Virtual_Servo_Current_Position" Addr="d2090" Device=""  Note="UNIT:MM" />
+    <!--<AI_ITEM Index="45" Name="AI_Lift_Virtual_Servo_Current_Position" Addr="d2090" Device=""  Note="UNIT:MM" />-->
     <AI_ITEM Index="46" Name="AI_Lift_Servo_1_Current_Position" Addr="d2092" Device="" />
     <AI_ITEM Index="47" Name="AI_Lift_Servo_2_Current_Position" Addr="d2094" Device="" />
     <AI_ITEM Index="48" Name="" />
     <AI_ITEM Index="49" Name="" />
-    <AI_ITEM Index="50" Name="AI_Lift_Virtual_Servo_Current_Speed" Addr="d2100" Device=""  Note="Unit:mm/s" />
+    <!--<AI_ITEM Index="50" Name="AI_Lift_Virtual_Servo_Current_Speed" Addr="d2100" Device=""  Note="Unit:mm/s" />-->
     <AI_ITEM Index="51" Name="AI_Lift_Servo_1_Current_Speed" Addr="d2102" Device="" />
     <AI_ITEM Index="52" Name="AI_Lift_Servo_2_Current_Speed" Addr="d2104" Device="" />
     <AI_ITEM Index="53" Name="" />

+ 1 - 1
VirgoRT/Devices/IODevices/IoPressureMeter.cs

@@ -20,7 +20,7 @@ namespace VirgoRT.Devices.IODevices
             mTorr,
         }
 
-        [Subscription("GaugeAlarm")]
+        //[Subscription("GaugeAlarm")]
         public bool GaugeAlarm
         {
             get { return _diGaugeFail != null ? _diGaugeFail.Value : false; }

+ 4 - 4
VirgoRT/Devices/IODevices/IoTriStateLift2.cs

@@ -191,13 +191,13 @@ namespace VirgoRT.Devices
             _aoSetP3 = ParseAoNode("aoSetP3", node, ioModule);
 
             //_aoServoEnable = ParseAoNode("aoServoEnable", node, ioModule);
-            _aoServoWorkMode = ParseAoNode("aoServoWorkMode", node, ioModule);
+            //_aoServoWorkMode = ParseAoNode("aoServoWorkMode", node, ioModule);
             _aoOriginSpeed = ParseAoNode("aoOriginSpeed", node, ioModule);
             _aoAutoSpeed = ParseAoNode("aoAutoSpeed", node, ioModule);
             _aoManualSpeed = ParseAoNode("aoManualSpeed", node, ioModule);
             _aoSoftUpLimit = ParseAoNode("aoSoftUpLimit", node, ioModule);
             _aoSoftDownLimit = ParseAoNode("aoSoftDownLimit", node, ioModule);
-            _aoAccDecSpeedTime = ParseAoNode("aoAccDecSpeedTime", node, ioModule);
+           // _aoAccDecSpeedTime = ParseAoNode("aoAccDecSpeedTime", node, ioModule);
             _aoPosDiff = ParseAoNode("aoPosDiff", node, ioModule);
         }
 
@@ -211,13 +211,13 @@ namespace VirgoRT.Devices
                 var value = (float)SC.GetValue<double>($"{Module}.{Name}.{data}");
                 _SetRealFloat(ao, value);
             }
-            _updateItem("ServoWorkMode", _aoServoWorkMode);
+            //_updateItem("ServoWorkMode", _aoServoWorkMode);
             _updateItem("OriginSpeed", _aoOriginSpeed);
             _updateItem("AutoSpeed", _aoAutoSpeed);
             _updateItem("ManualSpeed", _aoManualSpeed);
             _updateItem("SoftUpLimit", _aoSoftUpLimit);
             _updateItem("SoftDownLimit", _aoSoftDownLimit);
-            _updateItem("AccDecSpeedTime", _aoAccDecSpeedTime);
+            //_updateItem("AccDecSpeedTime", _aoAccDecSpeedTime);
             _updateItem("Position1", _aoSetP1);
             _updateItem("Position2", _aoSetP2);
             _updateItem("Position3", _aoSetP3);

+ 4 - 4
VirgoRT/Devices/JetPM.cs

@@ -54,7 +54,7 @@ namespace VirgoRT.Devices
         private readonly IoSensor            _VAC_sw;
         private readonly IoSensor            _WLK_sw;
         private readonly IoSensor            _CDAPressure;
-        private readonly IoSensor            _CDAPressure2;
+        //private readonly IoSensor            _CDAPressure2;
         private readonly IoSensor            _CoolantInletTC;
         private readonly IoSensor            _CoolantOutletTC;
         private readonly IoSensor            _ArmNotExtend;
@@ -245,7 +245,7 @@ namespace VirgoRT.Devices
 
         public bool HasPumpError => _MainPump.IsError || !_MainPump.IsRunning;
 
-        public bool IsCDA_OK => _CDAPressure.Value && (SC.GetValue<bool>("System.IsIgnoreCDAPressure2Alarm") || (_CDAPressure2?.Value ?? true));
+        public bool IsCDA_OK => _CDAPressure.Value /*&& (SC.GetValue<bool>("System.IsIgnoreCDAPressure2Alarm") || (_CDAPressure2?.Value ?? true))*/;
         public bool IsCoolantInletTC_OK => _CoolantInletTC.Value;
         public bool IsCoolantOutletTC_OK => _CoolantOutletTC.Value;
 
@@ -340,7 +340,7 @@ namespace VirgoRT.Devices
             _VAC_sw                 = DEVICE.GetDevice<IoSensor>($"{Module}.SensorVacSwitch");
             _WLK_sw                 = DEVICE.GetDevice<IoSensor>($"{Module}.SensorWaterLeakOk");
             _CDAPressure            = DEVICE.GetDevice<IoSensor>($"{Module}.SensorCDAPressureOk");
-            _CDAPressure2            = DEVICE.GetDevice<IoSensor>($"{Module}.SensorCDAPressureOk2");
+            //_CDAPressure2            = DEVICE.GetDevice<IoSensor>($"{Module}.SensorCDAPressureOk2");
             _CoolantInletTC         = DEVICE.GetDevice<IoSensor>($"{Module}.SensorCoolantInletTCOK");
             _CoolantOutletTC        = DEVICE.GetDevice<IoSensor>($"{Module}.SensorCoolantOutletTCOK");
             _ArmNotExtend           = DEVICE.GetDevice<IoSensor>($"{Module}.SensorArmNotExtend");
@@ -527,7 +527,7 @@ namespace VirgoRT.Devices
 
         public override bool CheckCDAOK()
         {
-            return _CDAPressure.Value && (SC.GetValue<bool>("System.IsIgnoreCDAPressure2Alarm") || (_CDAPressure2?.Value ?? true));
+            return _CDAPressure.Value /*&& (SC.GetValue<bool>("System.IsIgnoreCDAPressure2Alarm") || (_CDAPressure2?.Value ?? true))*/;
         }
 
         public override bool CheckCoolantInletTCOK()

+ 2 - 2
VirgoRT/Devices/SMCChiller.cs

@@ -194,7 +194,7 @@ namespace VirgoRT.Devices
         {
             get
             {
-                return GetAiValue($"{Module}.AI_Coolant_Inlet_Temp") + (float) _scCoolantInletTcFeedbackOffset;
+                return 0;//GetAiValue($"{Module}.AI_Coolant_Inlet_Temp") + (float) _scCoolantInletTcFeedbackOffset;
             }
         }
 
@@ -204,7 +204,7 @@ namespace VirgoRT.Devices
         {
             get
             {
-                return GetAiValue($"{Module}.AI_Coolant_Outlet_Temp") + (float)_scCoolantOutletTcFeedbackOffset;
+                return 0;//GetAiValue($"{Module}.AI_Coolant_Outlet_Temp") + (float)_scCoolantOutletTcFeedbackOffset;
             }
         }
 

+ 33 - 33
VirgoSimulator/Config/_ioDefineVirgo.xml

@@ -5,7 +5,7 @@
     <DI_ITEM Index="1" Name="DI_PM_ATM_SW" Device="" Addr="w20.01" Note="Interlock-PLC" />
     <DI_ITEM Index="2" Name="DI_PM_VAC_SW" Device="9.5T" Addr="w20.02" Note="Interlock-HW" />
     <DI_ITEM Index="3" Name="DI_Cooling_Water_Flow_SW" Device="" Addr="w20.03" Note="Interlock-HW" />
-    <DI_ITEM Index="4" Name="DI_LE_OT_SW_Alarm" Device="" Addr="w20.04" Note="1=OK, 0=alarm" />
+    <!--<DI_ITEM Index="4" Name="DI_LE_OT_SW_Alarm" Device="" Addr="w20.04" Note="1=OK, 0=alarm" />-->
     <DI_ITEM Index="5" Name="DI_Water_Leak" Device="" Addr="w20.05" Note="1=OK, 0=alarm" />
     <DI_ITEM Index="6" Name="DI_Slit_Door_Open_Pos" Device="" Addr="w20.06" Note="Interlock-HW" />
     <DI_ITEM Index="7" Name="DI_Slit_Door_Close_Pos" Device="" Addr="w20.07" Note="Interlock-HW" />
@@ -23,16 +23,16 @@
     <DI_ITEM Index="19" Name="DI_Substrate_Control_TC_Broken_Alarm" Device="" Addr="w21.03" Note="0=OK,1=alarm" />
     <DI_ITEM Index="20" Name="DI_Substrate_Monitor_TC_Broken_Alarm" Device="" Addr="w21.04" Note="0=OK,1=alarm" />
     <DI_ITEM Index="21" Name="DI_Substrate_Heater_On_FB" Device="" Addr="w21.05" Note="0=OFF,1=ON" />
-    <DI_ITEM Index="22" Name="DI_CDA_Pressure" Device="" Addr="w21.06" />
-    <DI_ITEM Index="23" Name="DI_CDA_Pressure_Switch_Out_2" Device="" Addr="W21.07" />
+    <DI_ITEM Index="22" Name="DI_CDA_Pressure_Switch_Out_1" Device="" Addr="w21.06" />
+    <!--<DI_ITEM Index="23" Name="DI_CDA_Pressure_Switch_Out_2" Device="" Addr="W21.07" />-->
     <DI_ITEM Index="24" Name="DI_SourceFan1" Device="" Addr="w21.08" />
     <DI_ITEM Index="25" Name="DI_CTRL_Box_Fans_Running" Device="" Addr="W21.09" />
     <DI_ITEM Index="26" Name="DI_Source_Match_Interlock" Device="" Addr="W21.10"/>
     <DI_ITEM Index="27" Name="DI_Bais_Match_Interlock" Device="" Addr="W21.11"/>
     <DI_ITEM Index="28" Name="" />
-    <DI_ITEM Index="29" Name="DI_GB_Interlock_Alarm" Device="" Addr="w21.13" Note="0=OK,1=Warning" />
+    <DI_ITEM Index="29" Name="DI_GB_Door_Interlock" Device="" Addr="w21.13" Note="0=OK,1=Warning" />
     <DI_ITEM Index="30" Name="DI_GB_Pressure_Interlock" Device="" Addr="W21.14" />
-    <DI_ITEM Index="31" Name="DI_CHB_Wall_OT_Switch_Alarm" Device="" Addr="W21.15"/>
+    <!--<DI_ITEM Index="31" Name="DI_CHB_Wall_OT_Switch_Alarm" Device="" Addr="W21.15"/>-->
     <DI_ITEM Index="32" Name="DI_SRF_Water_Flow_Switch" Device="" Addr="W22.00" />
     <DI_ITEM Index="33" Name="DI_Factory_Scrubber_SYS_Normal" Device="" Addr="W22.01" />
     <DI_ITEM Index="34" Name="" />
@@ -55,9 +55,9 @@
     <DI_ITEM Index="51" Name="DI_MFC4_Pressure" Device="" Addr="w23.03" />
     <DI_ITEM Index="52" Name="DI_MFC5_Pressure" Device="" Addr="w23.04" />
     <DI_ITEM Index="53" Name="DI_N2_Pressure" Device="" Addr="w23.05"  />
-    <DI_ITEM Index="54" Name="DI_Process_pressure_Alarm" Addr="w23.06" />
-    <DI_ITEM Index="55" Name="DI_Chamber_pressure_Alarm" Addr="w23.07" />
-    <DI_ITEM Index="56" Name="DI_Foreline_pressure_Alarm" Addr="w23.08" />
+    <!--<DI_ITEM Index="54" Name="DI_Process_pressure_Alarm" Addr="w23.06" />-->
+    <!--<DI_ITEM Index="55" Name="DI_Chamber_pressure_Alarm" Addr="w23.07" />-->
+    <!--<DI_ITEM Index="56" Name="DI_Foreline_pressure_Alarm" Addr="w23.08" />-->
     <DI_ITEM Index="57" Name="" />
     <DI_ITEM Index="58" Name="" />
     <DI_ITEM Index="59" Name="" />
@@ -69,7 +69,7 @@
     <DI_ITEM Index="65" Name="" />
     <DI_ITEM Index="66" Name="" />
     <DI_ITEM Index="67" Name="DI_CHB_Wall_TC_Deviation_out_of_range" Addr="w24.03" />
-    <DI_ITEM Index="68" Name="DI_Grid_TC_Broken_Alarm" Addr="w24.04"/>
+    <!--<DI_ITEM Index="68" Name="DI_Grid_TC_Broken_Alarm" Addr="w24.04"/>-->
     <DI_ITEM Index="69" Name="DI_CHB_Wall_Control_TC_Broken_Alarm" Addr="w24.05"/>
     <DI_ITEM Index="70" Name="DI_CHB_Wall_Monitor_TC_Broken_Alarm" Addr="w24.06"/>
     <DI_ITEM Index="71" Name="DI_CHB_Wall_Heater_On_FB" Addr="w24.07" />
@@ -105,9 +105,9 @@
     <DI_ITEM Index="101" Name="DI_Lift_Servo_Origin_Sensor" Addr="W26.05" Device=""  Note="1=On,0=Off    Lift Servo 原点开关(NO)" />
     <DI_ITEM Index="102" Name="DI_Lift_Servo_Up_Limit_Sensor" Addr="W26.06" Device=""  Note="1=On,0=Off    Lift Servo 上极限开关(NC)" />
     <DI_ITEM Index="103" Name="DI_Lift_Servo_Down_Limit_Sensor" Addr="W26.07" Device=""  Note="1=On,0=Off    Lift Servo 下极限开关(NC)" />
-    <DI_ITEM Index="104" Name="DI_Lift_Virtual_Servo_On" Addr="W26.08" Device=""  Note="1=On,0=Off    虚拟轴伺服On" />
-    <DI_ITEM Index="105" Name="DI_Lift_Virtual_Servo_Origin_Complete" Addr="W26.09" Device=""  Note="1=On,0=Off    虚拟轴伺服回原点完成" />
-    <DI_ITEM Index="106" Name="DI_Lift_Virtual_Servo_Busying" Addr="W26.10" Device=""  Note="1=On,0=Off    虚拟轴伺服运行中" />
+    <!--<DI_ITEM Index="104" Name="DI_Lift_Virtual_Servo_On" Addr="W26.08" Device=""  Note="1=On,0=Off    虚拟轴伺服On" />-->
+    <!--<DI_ITEM Index="105" Name="DI_Lift_Virtual_Servo_Origin_Complete" Addr="W26.09" Device=""  Note="1=On,0=Off    虚拟轴伺服回原点完成" />-->
+    <!--<DI_ITEM Index="106" Name="DI_Lift_Virtual_Servo_Busying" Addr="W26.10" Device=""  Note="1=On,0=Off    虚拟轴伺服运行中" />-->
     <DI_ITEM Index="107" Name="DI_Lift_Servo_Group_Go_Pos_1_Complete" Addr="W26.11" Device="" />
     <DI_ITEM Index="108" Name="DI_Lift_Servo_Group_Go_Pos_2_Complete" Addr="W26.12" Device="" />
     <DI_ITEM Index="109" Name="DI_Lift_Servo_Group_Go_Pos_3_Complete" Addr="W26.13" Device="" />
@@ -117,7 +117,7 @@
     <DI_ITEM Index="113" Name="" />
     <DI_ITEM Index="114" Name="DI_Lift_Servo_1_Servo_On" Addr="W27.02" Device=""  Note="1=On,0=Off    伺服-1ON" />
     <DI_ITEM Index="115" Name="DI_Lift_Servo_1_Servo_Origin_Complete" Addr="W27.03" Device=""  Note="1=On,0=Off    伺服-1回原点完成" />
-    <DI_ITEM Index="116" Name="DI_Lift_Servo_1_Servo_Busying" Addr="W27.04" Device=""  Note="1=On,0=Off    伺服-1伺服运行中" />
+    <!--<DI_ITEM Index="116" Name="DI_Lift_Servo_1_Servo_Busying" Addr="W27.04" Device=""  Note="1=On,0=Off    伺服-1伺服运行中" />-->
     <DI_ITEM Index="117" Name="DI_Lift_Servo_1_Braker_Open" Addr="W27.05" Device=""  Note="1=On,0=Off    伺服-1抱闸已打开" />
     <DI_ITEM Index="118" Name="DI_Lift_Servo_1_L_Servo_Driver_Alarm" Addr="W27.06" Device=""  Note="0=Normal, 1=Alarm  伺服驱动-1器报警" />
     <DI_ITEM Index="119" Name="DI_Lift_Servo_1_L_Servo_Driver_Warning" Addr="W27.07" Device=""  Note="0=Normal, 1=Alarm  伺服驱动-1器警告" />
@@ -133,7 +133,7 @@
     <DI_ITEM Index="129" Name="" />
     <DI_ITEM Index="130" Name="DI_Lift_Servo_2_Servo_On" Addr="W28.02" Device=""  Note="1=On,0=Off    伺服-1ON" />
     <DI_ITEM Index="131" Name="DI_Lift_Servo_2_Servo_Origin_Complete" Addr="W28.03" Device=""  Note="1=On,0=Off    伺服-1回原点完成" />
-    <DI_ITEM Index="132" Name="DI_Lift_Servo_2_Servo_Busying" Addr="W28.04" Device=""  Note="1=On,0=Off    伺服-1伺服运行中" />
+    <!--<DI_ITEM Index="132" Name="DI_Lift_Servo_2_Servo_Busying" Addr="W28.04" Device=""  Note="1=On,0=Off    伺服-1伺服运行中" />-->
     <DI_ITEM Index="133" Name="DI_Lift_Servo_2_Braker_Open" Addr="W28.05" Device=""  Note="1=On,0=Off    伺服-1抱闸已打开" />
     <DI_ITEM Index="134" Name="DI_Lift_Servo_2_L_Servo_Driver_Alarm" Addr="W28.06" Device=""  Note="0=Normal, 1=Alarm  伺服驱动-1器报警" />
     <DI_ITEM Index="135" Name="DI_Lift_Servo_2_L_Servo_Driver_Warning" Addr="W28.07" Device=""  Note="0=Normal, 1=Alarm  伺服驱动-1器警告" />
@@ -215,7 +215,7 @@
     <DO_ITEM Index="49" Name="" />
     <DO_ITEM Index="50" Name="" />
     <DO_ITEM Index="51" Name="" />
-    <DO_ITEM Index="52" Name="DO_Arm_Extend_Enable" Addr="w3.04" Note="允许EFEM Rorbot Arm伸入PM腔体内,带逻辑"/>
+    <!--<DO_ITEM Index="52" Name="DO_Arm_Extend_Enable" Addr="w3.04" Note="允许EFEM Rorbot Arm伸入PM腔体内,带逻辑"/>-->
     <DO_ITEM Index="53" Name="" />
     <DO_ITEM Index="54" Name="" />
     <DO_ITEM Index="55" Name="" />
@@ -259,11 +259,11 @@
     <DO_ITEM Index="93" Name="" />
     <DO_ITEM Index="94" Name="" />
     <DO_ITEM Index="95" Name="" />
-    <DO_ITEM Index="96" Name="DO_Lift_Servo-1_Manual_Up" Addr="W6.00" Device="" />
-    <DO_ITEM Index="97" Name="DO_Lift_Servo-1_Manual_Down" Addr="W6.01" Device="" />
-    <DO_ITEM Index="98" Name="DO_Lift_Servo-1_Stop" Addr="W6.02" Device="" />
-    <DO_ITEM Index="99" Name="DO_Lift_Servo-1_Step_Up" Addr="W6.03" Device="" />
-    <DO_ITEM Index="100" Name="DO_Lift_Servo-1_Step_Down" Addr="W6.04" Device="" />
+    <!--<DO_ITEM Index="96" Name="DO_Lift_Servo-1_Manual_Up" Addr="W6.00" Device="" />-->
+    <!--<DO_ITEM Index="97" Name="DO_Lift_Servo-1_Manual_Down" Addr="W6.01" Device="" />-->
+    <!--<DO_ITEM Index="98" Name="DO_Lift_Servo-1_Stop" Addr="W6.02" Device="" />-->
+    <!--<DO_ITEM Index="99" Name="DO_Lift_Servo-1_Step_Up" Addr="W6.03" Device="" />-->
+    <!--<DO_ITEM Index="100" Name="DO_Lift_Servo-1_Step_Down" Addr="W6.04" Device="" />-->
     <DO_ITEM Index="101" Name="" />
     <DO_ITEM Index="102" Name="" />
     <DO_ITEM Index="103" Name="" />
@@ -275,11 +275,11 @@
     <DO_ITEM Index="109" Name="" />
     <DO_ITEM Index="110" Name="" />
     <DO_ITEM Index="111" Name="" />
-    <DO_ITEM Index="112" Name="DO_Lift_Servo-2_Manual_Up" Addr="W7.00" Device="" />
-    <DO_ITEM Index="113" Name="DO_Lift_Servo-2_Manual_Down" Addr="W7.01" Device="" />
-    <DO_ITEM Index="114" Name="DO_Lift_Servo-2_Stop" Addr="W7.02" Device="" />
-    <DO_ITEM Index="115" Name="DO_Lift_Servo-2_Step_Up" Addr="W7.03" Device="" />
-    <DO_ITEM Index="116" Name="DO_Lift_Servo-2_Step_Down" Addr="W7.04" Device="" />
+    <!--<DO_ITEM Index="112" Name="DO_Lift_Servo-2_Manual_Up" Addr="W7.00" Device="" />-->
+    <!--<DO_ITEM Index="113" Name="DO_Lift_Servo-2_Manual_Down" Addr="W7.01" Device="" />-->
+    <!--<DO_ITEM Index="114" Name="DO_Lift_Servo-2_Stop" Addr="W7.02" Device="" />-->
+    <!--<DO_ITEM Index="115" Name="DO_Lift_Servo-2_Step_Up" Addr="W7.03" Device="" />-->
+    <!--<DO_ITEM Index="116" Name="DO_Lift_Servo-2_Step_Down" Addr="W7.04" Device="" />-->
     <DO_ITEM Index="117" Name="" />
     <DO_ITEM Index="118" Name="" />
     <DO_ITEM Index="119" Name="" />
@@ -335,7 +335,7 @@
     <AO_ITEM Index="23" Name="" />
     <AO_ITEM Index="24" Name="" />
     <AO_ITEM Index="25" Name="AO_BaisRF_Enable" BufferOffset="50" Device="" Addr="d1050" Note="0=Substrate heater mode ,1=Bais RF mode" />
-    <AO_ITEM Index="26" Name="AO_Grid_TC_Enable" BufferOffset="52" Device=""  Addr="d1052" Note="1=Grid TC"/>
+    <!--<AO_ITEM Index="26" Name="AO_Grid_TC_Enable" BufferOffset="52" Device=""  Addr="d1052" Note="1=Grid TC"/>-->
     <AO_ITEM Index="27" Name="AO_Lift_Servo_Enable" BufferOffset="54" Device=""  Addr="d1054" Note="0=Lift Pin ,1=Lift  Servo"/>
     <AO_ITEM Index="28" Name="AO_Lift_Servo_Auto_speed" BufferOffset="56" Device=""  Addr="d1056" Note="mm/s"/>
     <AO_ITEM Index="29" Name="AO_Lift_Servo_manual_speed" BufferOffset="58" Device=""  Addr="d1058" Note="mm/s" />
@@ -354,7 +354,7 @@
     <AO_ITEM Index="42" Name="" />
     <AO_ITEM Index="43" Name="" />
     <AO_ITEM Index="44" Name="" />
-    <AO_ITEM Index="45" Name="AO_Lift_Servo_Work_Mode" Addr="D1090" Device="" />
+    <!--<AO_ITEM Index="45" Name="AO_Lift_Servo_Work_Mode" Addr="D1090" Device="" />-->
     <AO_ITEM Index="46" Name="AO_Lift_Servo_Group_ABS_POS_Diff" Addr="D1092" Device="" />
     <AO_ITEM Index="47" Name="" />
     <AO_ITEM Index="48" Name="" />
@@ -371,7 +371,7 @@
     <AO_ITEM Index="59" Name="AO_Lift_Servo_Group_Manual_Speed" Addr="D1118" Device=""  Note="UI" />
     <AO_ITEM Index="60" Name="AO_Lift_Servo_Group_Soft_Up_Limit" Addr="D1120" Device=""  Note="RT" />
     <AO_ITEM Index="61" Name="AO_Lift_Servo_Group_soft_Down_Limit" Addr="D1122" Device="" />
-    <AO_ITEM Index="62" Name="AO_Lift_Servo_Group_ACC_DEC_Speed_Time" Addr="D1124" Device="" />
+    <!--<AO_ITEM Index="62" Name="AO_Lift_Servo_Group_ACC_DEC_Speed_Time" Addr="D1124" Device="" />-->
     <AO_ITEM Index="63" Name="" />
     <AO_ITEM Index="64" Name="" />
     <AO_ITEM Index="65" Name="" />
@@ -396,8 +396,8 @@
     <AI_ITEM Index="6" Name="AI_MFC3_Flow" BufferOffset="12" Device="" Addr="d2012" Note="MFC" />
     <AI_ITEM Index="7" Name="AI_MFC4_Flow" BufferOffset="14" Device="" Addr="d2014" Note="MFC" />
     <AI_ITEM Index="8" Name="AI_MFC5_Flow" BufferOffset="16" Device="" Addr="d2016" Note="MFC" />
-    <AI_ITEM Index="9" Name="AI_Coolant_Inlet_Temp" BufferOffset="18" Device="" Addr="d2018" Note="Chiller" />
-    <AI_ITEM Index="10" Name="AI_Coolant_Outlet_Temp" BufferOffset="20" Device="" Addr="d2020" Note="Chiller" />
+    <!--<AI_ITEM Index="9" Name="AI_Coolant_Inlet_Temp" BufferOffset="18" Device="" Addr="d2018" Note="Chiller" />-->
+    <!--<AI_ITEM Index="10" Name="AI_Coolant_Outlet_Temp" BufferOffset="20" Device="" Addr="d2020" Note="Chiller" />-->
     <AI_ITEM Index="11" Name="AI_Substrate_Control_TC_Temp" BufferOffset="22" Device="" Addr="d2022" Note="TC temp" />
     <AI_ITEM Index="12" Name="AI_Substrate_Monitor_TC_Temp" BufferOffset="24" Device="" Addr="d2024" Note="TC temp" />
     <AI_ITEM Index="13" Name="" />
@@ -422,7 +422,7 @@
     <AI_ITEM Index="32" Name="" />
     <AI_ITEM Index="33" Name="" />
     <AI_ITEM Index="34" Name="" />
-    <AI_ITEM Index="35" Name="AI_Grid_TC_Temp" BufferOffset="70" Device="" Addr="d2070" Note="TC temp" />
+    <!--<AI_ITEM Index="35" Name="AI_Grid_TC_Temp" BufferOffset="70" Device="" Addr="d2070" Note="TC temp" />-->
     <AI_ITEM Index="36" Name="AI_CHB_Wall_Control_TC_Temp" BufferOffset="72" Device="" Addr="d2072" Note="TC temp" />
     <AI_ITEM Index="37" Name="AI_CHB_Wall_Monitor_TC_Temp" BufferOffset="74" Device="" Addr="d2074" Note="TC temp" />
     <AI_ITEM Index="38" Name="" />
@@ -432,12 +432,12 @@
     <AI_ITEM Index="42" Name="AI_Generator_Forward_Power" BufferOffset="84" Device="" Addr="d2084" Note="ICP Souce/RPS" />
     <AI_ITEM Index="43" Name="AI_Generator_Reflect_Power" BufferOffset="86" Device="" Addr="d2086" />
     <AI_ITEM Index="44" Name="" />
-    <AI_ITEM Index="45" Name="AI_Lift_Virtual_Servo_Current_Position" Addr="d2090" Device=""  Note="UNIT:MM" />
+    <!--<AI_ITEM Index="45" Name="AI_Lift_Virtual_Servo_Current_Position" Addr="d2090" Device=""  Note="UNIT:MM" />-->
     <AI_ITEM Index="46" Name="AI_Lift_Servo_1_Current_Position" Addr="d2092" Device="" />
     <AI_ITEM Index="47" Name="AI_Lift_Servo_2_Current_Position" Addr="d2094" Device="" />
     <AI_ITEM Index="48" Name="" />
     <AI_ITEM Index="49" Name="" />
-    <AI_ITEM Index="50" Name="AI_Lift_Virtual_Servo_Current_Speed" Addr="d2100" Device=""  Note="Unit:mm/s" />
+    <!--<AI_ITEM Index="50" Name="AI_Lift_Virtual_Servo_Current_Speed" Addr="d2100" Device=""  Note="Unit:mm/s" />-->
     <AI_ITEM Index="51" Name="AI_Lift_Servo_1_Current_Speed" Addr="d2102" Device="" />
     <AI_ITEM Index="52" Name="AI_Lift_Servo_2_Current_Speed" Addr="d2104" Device="" />
     <AI_ITEM Index="53" Name="" />

+ 2 - 1
VirgoSimulator/Devices/EfemSimulator.cs

@@ -130,7 +130,8 @@ namespace VirgoSimulator.Devices
             ushort millionSec = this.SimuOperationTime(op);
 
             // Sleep
-            await Task.Run(() => Thread.Sleep(millionSec));
+            //await Task.Run(() => Thread.Sleep(millionSec));
+            await Task.Delay(millionSec);
 
             // build the INF string
             string strINF = string.Empty;

+ 19 - 19
VirgoSimulator/Instances/SimulatorSystem.cs

@@ -55,8 +55,8 @@ namespace VirgoSimulator.Instances
             // chamber
             IO.DI[$"{mod}.DI_Lid_Closed"].Value = true;
             IO.DI[$"{mod}.DI_PM_ATM_SW"].Value = true;
-            IO.DI[$"{mod}.DI_CDA_Pressure"].Value = true;
-            IO.DI[$"{mod}.DI_CDA_Pressure_Switch_Out_2"].Value = true;
+            IO.DI[$"{mod}.DI_CDA_Pressure_Switch_Out_1"].Value = true;
+            //IO.DI[$"{mod}.DI_CDA_Pressure_Switch_Out_2"].Value = true;
             IO.DI[$"{mod}.DI_SourceFan1"].Value = true;
 
             IO.DI[$"{mod}.DI_CTRL_Box_Fans_Running"].Value = true;
@@ -84,8 +84,8 @@ namespace VirgoSimulator.Instances
             IO.DI[$"{mod}.DI_Lift_Pin_Up"].Value = false;
             IO.DI[$"{mod}.DI_Lift_Pin_Down"].Value = true;
             //
-            IO.DI[$"{mod}.DI_LE_OT_SW_Alarm"].Value = false;
-            IO.DI[$"{mod}.DI_GB_Interlock_Alarm"].Value = false;
+            //IO.DI[$"{mod}.DI_LE_OT_SW_Alarm"].Value = false;
+            IO.DI[$"{mod}.DI_GB_Door_Interlock"].Value = false;
 
             IO.DI[$"{mod}.DI_SRF_Water_Flow_Switch"].Value = true;
             IO.DI[$"{mod}.DI_ACR_Fans_Running"].Value = true;
@@ -110,18 +110,18 @@ namespace VirgoSimulator.Instances
             SetAiValue($"{mod}.AI_Substrate_Monitor_TC_Temp", 27);
             SetAiValue($"{mod}.AI_Foreline_Control_TC_Temp", 28);
             SetAiValue($"{mod}.AI_Foreline_Monitor_TC_Temp", 27);
-            SetAiValue($"{mod}.AI_Coolant_Inlet_Temp", 28);
+            //SetAiValue($"{mod}.AI_Coolant_Inlet_Temp", 28);
             //SetAiValue($"{mod}.AI_CHB_Wall_Control_TC_Temp", 28);
             //SetAiValue($"{mod}.AI_CHB_Wall_Monitor_TC_Temp", 27);
             //SetAiValue($"{mod}.AI_Grid_TC_Temp", 28);
-            if (mod == ModuleName.PMA)
-            {
-                SetAiValue($"{mod}.AI_Coolant_Outlet_Temp", 29);
-            }
-            else if (mod == ModuleName.PMB)
-            {
-                SetAiValue($"{mod}.AI_Coolant_Outlet_Temp", 30);
-            }
+            //if (mod == ModuleName.PMA)
+            //{
+            //    SetAiValue($"{mod}.AI_Coolant_Outlet_Temp", 29);
+            //}
+            //else if (mod == ModuleName.PMB)
+            //{
+            //    SetAiValue($"{mod}.AI_Coolant_Outlet_Temp", 30);
+            //}
             // Datetime
             SetAiValue($"{mod}.AI_Year", DateTime.Today.Year);
             SetAiValue($"{mod}.AI_Month", DateTime.Today.Month);
@@ -274,7 +274,7 @@ namespace VirgoSimulator.Instances
 
             if (IO.DO[$"{mod}.DO_Lift_Servo_Group_Go_Position1"].Value)
             {
-                IO.DI[$"{mod}.DI_Lift_Virtual_Servo_Origin_Complete"].Value = false;
+                //IO.DI[$"{mod}.DI_Lift_Virtual_Servo_Origin_Complete"].Value = false;
                 IO.DI[$"{mod}.DI_Lift_Servo_1_Servo_Origin_Complete"].Value = false;
                 IO.DI[$"{mod}.DI_Lift_Servo_Group_Go_Pos_Origin_Complete"].Value = false;
                 IO.DI[$"{mod}.DI_Lift_Servo_2_Servo_Origin_Complete"].Value = false;
@@ -284,7 +284,7 @@ namespace VirgoSimulator.Instances
             }
             if (IO.DO[$"{mod}.DO_Lift_Servo_Group_Go_Position2"].Value)
             {
-                IO.DI[$"{mod}.DI_Lift_Virtual_Servo_Origin_Complete"].Value = false;
+                //IO.DI[$"{mod}.DI_Lift_Virtual_Servo_Origin_Complete"].Value = false;
                 IO.DI[$"{mod}.DI_Lift_Servo_1_Servo_Origin_Complete"].Value = false;
                 IO.DI[$"{mod}.DI_Lift_Servo_Group_Go_Pos_Origin_Complete"].Value = false;
                 IO.DI[$"{mod}.DI_Lift_Servo_2_Servo_Origin_Complete"].Value = false;
@@ -294,7 +294,7 @@ namespace VirgoSimulator.Instances
             }
             if (IO.DO[$"{mod}.DO_Lift_Servo_Group_Go_Position3"].Value)
             {
-                IO.DI[$"{mod}.DI_Lift_Virtual_Servo_Origin_Complete"].Value = false;
+                //IO.DI[$"{mod}.DI_Lift_Virtual_Servo_Origin_Complete"].Value = false;
                 IO.DI[$"{mod}.DI_Lift_Servo_1_Servo_Origin_Complete"].Value = false;
                 IO.DI[$"{mod}.DI_Lift_Servo_Group_Go_Pos_Origin_Complete"].Value = false;
                 IO.DI[$"{mod}.DI_Lift_Servo_2_Servo_Origin_Complete"].Value = false;
@@ -305,7 +305,7 @@ namespace VirgoSimulator.Instances
 
             if (IO.DO[$"{mod}.DO_Lift_Servo_Group_Origin"].Value)
             {
-                IO.DI[$"{mod}.DI_Lift_Virtual_Servo_Origin_Complete"].Value = true;
+                //IO.DI[$"{mod}.DI_Lift_Virtual_Servo_Origin_Complete"].Value = true;
                 IO.DI[$"{mod}.DI_Lift_Servo_1_Servo_Origin_Complete"].Value = true;
                 IO.DI[$"{mod}.DI_Lift_Servo_Group_Go_Pos_Origin_Complete"].Value = true;
                 IO.DI[$"{mod}.DI_Lift_Servo_2_Servo_Origin_Complete"].Value = true;
@@ -316,11 +316,11 @@ namespace VirgoSimulator.Instances
 
             if (IO.DO[$"{mod}.DO_Lift_Servo_Group_Manual_Up"].Value)
             {
-                _SetRealFloat(IO.AI[$"{mod}.AI_Lift_Virtual_Servo_Current_Position"], _GetRealFloat(IO.AI[$"{mod}.AI_Lift_Virtual_Servo_Current_Position"]) + 0.3f);
+                //_SetRealFloat(IO.AI[$"{mod}.AI_Lift_Virtual_Servo_Current_Position"], _GetRealFloat(IO.AI[$"{mod}.AI_Lift_Virtual_Servo_Current_Position"]) + 0.3f);
             }
             else if (IO.DO[$"{mod}.DO_Lift_Servo_Group_Manual_Down"].Value)
             {
-                _SetRealFloat(IO.AI[$"{mod}.AI_Lift_Virtual_Servo_Current_Position"], _GetRealFloat(IO.AI[$"{mod}.AI_Lift_Virtual_Servo_Current_Position"]) - 0.3f);
+                //_SetRealFloat(IO.AI[$"{mod}.AI_Lift_Virtual_Servo_Current_Position"], _GetRealFloat(IO.AI[$"{mod}.AI_Lift_Virtual_Servo_Current_Position"]) - 0.3f);
             }
         }
 

+ 1 - 1
VirgoUI/MainView.xaml

@@ -333,7 +333,7 @@
                             </Grid.ColumnDefinitions>
                             <ComboBox ItemsSource="{Binding WarnEventLogList}" Visibility="Visible"
                                       SelectedIndex="{Binding WarnEventLogList.Count,Mode=OneWay,Converter={StaticResource collectionLastIndexConverter}}" 
-                                      VerticalContentAlignment="Center" FontSize="14" Height="Auto" IsDropDownOpen="{Binding IsAlarmListOpen}">
+                                      VerticalContentAlignment="Center" FontSize="14" Height="Auto">
                                 <ComboBox.ItemTemplate>
                                     <DataTemplate>
                                         <ContentControl>

+ 3 - 3
VirgoUI/Models/PMs/PmOverviewView.xaml

@@ -198,9 +198,9 @@
                     <TextBlock Text="CDA" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center"/>
                 </Border>
                 <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="2" Grid.Column="1" Padding="5,1">
-                    <StackPanel Orientation="Horizontal">
-                        <deviceControl:AITSensor  IsInterlockMode="True" DeviceData="{Binding SensorCDAPressureOk}" Margin="25,0,0,0"/>
-                        <deviceControl:AITSensor  IsInterlockMode="True" DeviceData="{Binding SensorCDAPressureOk2}" Margin="10,0,0,0"/>
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                        <deviceControl:AITSensor  IsInterlockMode="True" DeviceData="{Binding SensorCDAPressureOk}"/>
+                        <!--<deviceControl:AITSensor  IsInterlockMode="True" DeviceData="{Binding SensorCDAPressureOk2}" Margin="10,0,0,0"/>-->
                     </StackPanel>
                 </Border>
 

+ 2 - 2
VirgoUI/Models/PMs/PmOverviewViewModel.cs

@@ -470,8 +470,8 @@ namespace VirgoUI.Client.Models.PMs
         [Subscription("SensorCDAPressureOk")]
         public AITSensorData SensorCDAPressureOk { get; set; }
 
-        [Subscription("SensorCDAPressureOk2")]
-        public AITSensorData SensorCDAPressureOk2 { get; set; }
+        //[Subscription("SensorCDAPressureOk2")]
+        //public AITSensorData SensorCDAPressureOk2 { get; set; }
 
         [Subscription("SourceFan1")]
         public AITSensorData SourceFan1 { get; set; }