Browse Source

1. Revise IoCoolingBuffer bug;

niuyx 2 days ago
parent
commit
f625789876

+ 1 - 1
Jet/Jet_001_2P_Jet/EfemRT/Devices/IoCoolingBuffer.cs

@@ -305,7 +305,7 @@ namespace Aitex.Core.RT.Device.Unit
             _scLiftUpTimeout = ParseScNode("scUpTimeout", node);
             _scLiftUpTimeout = ParseScNode("scUpTimeout", node);
             _scLiftDownTimeout = ParseScNode("scDownTimeout", node);
             _scLiftDownTimeout = ParseScNode("scDownTimeout", node);
 
 
-            DATA.Subscribe($"{module}.{module}.Status", () => _state.ToString());
+            //DATA.Subscribe($"{Module}.{Module}.Status", () => _state.ToString());
         }
         }
         public bool ManualOperation = false;
         public bool ManualOperation = false;
 
 

+ 2 - 2
Jet/Jet_001_2P_Jet/EfemSimulator/Config/SimUILayout1.xml

@@ -5,8 +5,8 @@
 	<Navigation Id="platform" Name="Platform" >
 	<Navigation Id="platform" Name="Platform" >
 		<SubView Id="io1" Name="Card1" ViewClass="EfemSimulator.Views.SimulatorCard1View" Assembly="EfemSimulator"/>
 		<SubView Id="io1" Name="Card1" ViewClass="EfemSimulator.Views.SimulatorCard1View" Assembly="EfemSimulator"/>
 		<SubView Id="robot" Name="Robot" ViewClass="EfemSimulator.Device.Robot.Rorze.RorzeRobot751View" Assembly="EfemSimulator" Port="10110"/>
 		<SubView Id="robot" Name="Robot" ViewClass="EfemSimulator.Device.Robot.Rorze.RorzeRobot751View" Assembly="EfemSimulator" Port="10110"/>
-		<SubView Id="lp1" Name="LoadPort1" ViewClass="EfemSimulator.Device.LoadPorts.FortrendSmif.SmifPortView" Assembly="EfemSimulator" Port="COM12"/>
-		<SubView Id="lp2" Name="LoadPort2" ViewClass="EfemSimulator.Device.LoadPorts.FortrendSmif.SmifPort1View" Assembly="EfemSimulator" Port="COM14"/>
+		<SubView Id="lp1" Name="LoadPort1" ViewClass="EfemSimulator.Device.LoadPorts.FortrendSmif.SmifPortView" Assembly="EfemSimulator" Port="COM1"/>
+		<SubView Id="lp2" Name="LoadPort2" ViewClass="EfemSimulator.Device.LoadPorts.FortrendSmif.SmifPort1View" Assembly="EfemSimulator" Port="COM4"/>
 		<SubView Id="ffu1" Name="FFU" ViewClass="MECF.Framework.Simulator.Core.FFUs.FfuView" Assembly="MECF.Framework.Simulator.Core" Port="COM20"/>
 		<SubView Id="ffu1" Name="FFU" ViewClass="MECF.Framework.Simulator.Core.FFUs.FfuView" Assembly="MECF.Framework.Simulator.Core" Port="COM20"/>
 	</Navigation>
 	</Navigation>
 	
 	

+ 1 - 1
Jet/Jet_001_2P_Jet/EfemUI/Views/TopView2LP.xaml

@@ -144,7 +144,7 @@
                         <TextBlock VerticalAlignment="Center" Text="{Binding _CoolingBuffer1Status}" Background="{Binding CoolingBuffer1Background}" Style="{StaticResource TopPanelStatus}"    Width="120" HorizontalAlignment="Center"/>
                         <TextBlock VerticalAlignment="Center" Text="{Binding _CoolingBuffer1Status}" Background="{Binding CoolingBuffer1Background}" Style="{StaticResource TopPanelStatus}"    Width="120" HorizontalAlignment="Center"/>
                     </Border>
                     </Border>
                     <Border Visibility="{Binding CoolingBuffer2Enable,Converter={StaticResource boolVisibilityConverter}, ConverterParameter={StaticResource True}}" BorderThickness="1" BorderBrush="Gray" Background="{StaticResource NewBKColor}" Width="141" Height="32">
                     <Border Visibility="{Binding CoolingBuffer2Enable,Converter={StaticResource boolVisibilityConverter}, ConverterParameter={StaticResource True}}" BorderThickness="1" BorderBrush="Gray" Background="{StaticResource NewBKColor}" Width="141" Height="32">
-                        <TextBlock Text="CoolingBuffer2" Background="{Binding CoolingBuffer2Background}" Style="{StaticResource txtStatus}" HorizontalAlignment="Center" />
+                        <TextBlock Text="CoolingBuffer2" Style="{StaticResource txtStatus}" HorizontalAlignment="Center" />
                     </Border>
                     </Border>
                     <Border Visibility="{Binding CoolingBuffer2Enable,Converter={StaticResource boolVisibilityConverter}, ConverterParameter={StaticResource True}}" BorderThickness="1" BorderBrush="Gray" VerticalAlignment="Center" Background="{Binding CoolingBuffer2Status}" >
                     <Border Visibility="{Binding CoolingBuffer2Enable,Converter={StaticResource boolVisibilityConverter}, ConverterParameter={StaticResource True}}" BorderThickness="1" BorderBrush="Gray" VerticalAlignment="Center" Background="{Binding CoolingBuffer2Status}" >
                         <TextBlock VerticalAlignment="Center" Text="{Binding _CoolingBuffer2Status}" Background="{Binding CoolingBuffer2Background}"  Style="{StaticResource TopPanelStatus}"    Width="120" HorizontalAlignment="Center"/>
                         <TextBlock VerticalAlignment="Center" Text="{Binding _CoolingBuffer2Status}" Background="{Binding CoolingBuffer2Background}"  Style="{StaticResource TopPanelStatus}"    Width="120" HorizontalAlignment="Center"/>