1.修改efem water leak 和 名称等相关

VirgoRT/Config/_ioDefineVirgo.xml

@@ -17,7 +17,7 @@
 		<DI_ITEM Index="13" Name="" Device="" Addr="w20.13" />
 		<DI_ITEM Index="14" Name="DI_ARM_Not_Extend_to_PM" Device="" Addr="w20.14" Note="Interlock-PLC" />
 		<DI_ITEM Index="15" Name="DI_Generator_Hardware_Interlock" Device="" Addr="w20.15" Note="1=rf interlock ok,0=rf interlock off" />
-		<DI_ITEM Index="16" Name="DI_EFEMWaterLeak" Device="" Addr="w21.00"/>
+		<DI_ITEM Index="16" Name="DI_EFEM_Water_Leak_Sensor" Device="" Addr="w21.00"/>
 		<!--<DI_ITEM Index="17" Name="DI_Coolant_Inlet_TC_Broken_Alarm" Device="" Addr="w21.01" />-->
 		<!--<DI_ITEM Index="18" Name="DI_Coolant_Outlet_TC_Broken_Alarm" Device="" Addr="w21.02" />-->
 		<DI_ITEM Index="19" Name="DI_Substrate_Control_TC_Broken_Alarm" Device="" Addr="w21.03" Note="0=OK,1=alarm" />

VirgoRT/Devices/EFEM/Efem.cs

@@ -632,7 +632,7 @@ namespace VirgoRT.Devices.EFEM
 
             return _pm[mod - ModuleName.PMA];
         }
-
+        private readonly R_TRIG _trigCDAError = new R_TRIG();
         //----------------------------------Private Method-------------------------------
         // 
         private void MsgOnEventUpdated(object sender, EventArgs e)
@@ -690,7 +690,8 @@ namespace VirgoRT.Devices.EFEM
                                 Singleton<RouteManager>.Instance.EFEM.PostMsg(EfemEntity.MSG.Error);
                             }
                         }
-                        if (!baData1[2])   // Bit[2] ON=Normal, OFF=Abnormal
+                        _trigCDAError.CLK = !baData1[2];
+                        if (_trigCDAError.Q)   // Bit[2] ON=Normal, OFF=Abnormal
                         {
                             EV.Notify(EFEMCDAError);
                             EV.PostAlarmLog(Module.ToString(), "EFEM System compressed air pressure low");

VirgoRT/Devices/JetPM.cs

@@ -468,7 +468,7 @@ namespace VirgoRT.Devices
                 return true;
             });
 
-            if (IsWLK && IO.DI[$"{ModuleName.PMA}.DI_EFEMWaterLeak"].Value)
+            if (IsWLK && IO.DI[$"{ModuleName.PMA}.DI_EFEM_Water_Leak_Sensor"].Value)
             {
                 IO.DO[$"{ModuleName.PMA}.DO_EV5_Water_Valve"].Value = true;
                 IO.DO[$"{ModuleName.PMB}.DO_EV5_Water_Valve"].Value = true;
@@ -659,7 +659,7 @@ namespace VirgoRT.Devices
             if(_ChamberType == (int)JetChamber.VirgoMask)
             {
                 var isWLKError = !IsWLK;
-                var isEFEMWLKError = !IO.DI[$"{ModuleName.PMA}.DI_EFEMWaterLeak"].Value;
+                var isEFEMWLKError = !IO.DI[$"{ModuleName.PMA}.DI_EFEM_Water_Leak_Sensor"].Value;
                 _trigWaterLeak.CLK = isWLKError || isEFEMWLKError;
                 if (_trigWaterLeak.Q)
                 {
@@ -670,7 +670,7 @@ namespace VirgoRT.Devices
                     if (isEFEMWLKError)
                         EV.PostMessage(ModuleName.EFEM.ToString(), EventEnum.DefaultAlarm, $"EFEM water leak");
                 }
-                if (IsWLK && IO.DI[$"{ModuleName.PMA}.DI_EFEMWaterLeak"].Value && IO.DI[$"{ModuleName.PMA}.DI_Reset_Signal_Reply"].Value && !IO.DI[$"{ModuleName.PMA}.DI_Water_Valve_Opened"].Value)
+                if (IsWLK && IO.DI[$"{ModuleName.PMA}.DI_EFEM_Water_Leak_Sensor"].Value && IO.DI[$"{ModuleName.PMA}.DI_Reset_Signal_Reply"].Value && !IO.DI[$"{ModuleName.PMA}.DI_Water_Valve_Opened"].Value)
                 {
                     IO.DO[$"{ModuleName.PMA}.DO_EV5_Water_Valve"].Value = true;
                     IO.DO[$"{ModuleName.PMB}.DO_EV5_Water_Valve"].Value = true;

VirgoRT/Modules/HomeAll.cs

@@ -27,9 +27,10 @@ namespace VirgoRT.Modules
 
             _lstModules.Clear();
 
+            _lstModules.Add(new List<IModuleEntity>() { Singleton<RouteManager>.Instance.EFEM });
+
             _lstModules.Add(pms);
 
-            _lstModules.Add(new List<IModuleEntity>() { Singleton<RouteManager>.Instance.EFEM });
 
             return Result.RUN;
         }

VirgoSimulator/Config/_ioDefineVirgo.xml

@@ -17,7 +17,7 @@
     <DI_ITEM Index="13" Name="DI_Guide_Pin_Medium_Lifter_Down_Pos" Device="" Addr="w20.13" />
     <DI_ITEM Index="14" Name="DI_ARM_Not_Extend_to_PM" Device="" Addr="w20.14" Note="Interlock-PLC" />
     <DI_ITEM Index="15" Name="DI_Generator_Hardware_Interlock" Device="" Addr="w20.15" Note="1=rf interlock ok,0=rf interlock off" />
-    <DI_ITEM Index="16" Name="DI_EFEMWaterLeak" Device="" Addr="w21.00" />
+    <DI_ITEM Index="16" Name="DI_EFEM_Water_Leak_Sensor" Device="" Addr="w21.00" />
     <!--<DI_ITEM Index="17" Name="DI_Coolant_Inlet_TC_Broken_Alarm" Device="" Addr="w21.01" />-->
     <!--<DI_ITEM Index="18" Name="DI_Coolant_Outlet_TC_Broken_Alarm" Device="" Addr="w21.02" />-->
     <DI_ITEM Index="19" Name="DI_Substrate_Control_TC_Broken_Alarm" Device="" Addr="w21.03" Note="0=OK,1=alarm" />

VirgoUI/Models/Operate/Overview/OverView.xaml

@@ -419,7 +419,7 @@
                                 <ColumnDefinition Width="0"/>
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
-                            <deviceControl:AITSensor Margin="-30,0,5,0" GreenColor="True" LightOnValue="{Binding IsRtInitialized}"></deviceControl:AITSensor>
+                            <deviceControl:AITSensor Margin="-30,0,5,0" GreenColor="True" LightOnValue="{Binding IsRtInitialized}" Visibility="Collapsed"></deviceControl:AITSensor>
 
                             <Button Style="{StaticResource BtnControl}" Grid.Column="1" Content="Initialize"  Width="120" Height="25">
                                 <i:Interaction.Triggers>

VirgoUI/Models/PMs/PmOverviewView.xaml

@@ -216,7 +216,7 @@
 
                 <!--SensorWaterLeakOk-->
                 <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,1,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="0" Grid.Column="2" Padding="5,1">
-                    <TextBlock Text="Water Leak" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center"/>
+                    <TextBlock Text="PM Water Leak" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center"/>
                 </Border>
                 <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,1,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="0" Grid.Column="3" Padding="5,1">
                     <deviceControl:AITSensor  IsInterlockMode="True" DeviceData="{Binding SensorWaterLeakOk}" />
@@ -224,7 +224,7 @@
 
                 <!--SensorArmNotExtend-->
                 <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="2" Grid.Column="2"  Padding="5,1">
-                    <TextBlock Text="Arm Unextend" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center"/>
+                    <TextBlock Text="Arm Not Extend" 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="3" Padding="5,1">
                     <deviceControl:AITSensor  IsInterlockMode="True" DeviceData="{Binding SensorArmNotExtend}" />