Ver código fonte

revise efem lock color,revise hvd recipe

chenzk 1 semana atrás
pai
commit
0e12a3f8c0

+ 1 - 1
CyberX8_MainPages/Views/HvdRecipeView.xaml

@@ -59,7 +59,7 @@
                                 <RowDefinition Height="75"/>
                                 <RowDefinition/>
                             </Grid.RowDefinitions>
-                            <UserControls:GroupTextBoxControl Grid.Row="0" Title="Dry Time" Unit="sec" MinValue="0" MaxValue="120" IntValue="{Binding Recipe.DryTime,Mode=TwoWay}"
+                            <UserControls:GroupTextBoxControl Grid.Row="0" Title="Dry Time" Unit="sec" MinValue="0" MaxValue="600" IntValue="{Binding Recipe.DryTime,Mode=TwoWay}"
                                                                   ValidResult="{Binding PropertyValidResultDic[DryTime],Mode=TwoWay}" Width="290"/>
                         </Grid>
                     </Grid>

+ 1 - 1
CyberX8_RT/Config/Devices/WagoControllerCfg-Simulator.xml

@@ -24,7 +24,7 @@
 				<DI Name="r_LoaderA_Wafer_Present"  Address="16" Invert="false"/>
 				<DI Name="r_LoaderB_Wafer_Present"  Address="17" Invert="false"/>
 				<DI Name="r_Cathode_Present"  Address="18" Invert="false"/>
-				<DI Name="DI19"  Address="19" Invert="false"/>
+				<DI Name="r_Door_Locked"  Address="19" Invert="false"/>
 				<DI Name="DI20"  Address="20" Invert="false"/>
 				<DI Name="DI21"  Address="21" Invert="false"/>
 				<DI Name="DI22"  Address="22" Invert="false"/>

+ 14 - 14
CyberX8_Simulator/Config/UILayout.xml

@@ -31,20 +31,20 @@
 	
 	<Navigation Id="Power" Name="Power" >		
 		<SubView Id="Power1" Name="Power1" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="820"/>
-		<SubView Id="Power2" Name="Power2" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="821"/>
-		<SubView Id="Power3" Name="Power3" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="822"/>
-		<SubView Id="Power4" Name="Power4" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="823"/>
-		<SubView Id="Power5" Name="Power5" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="824"/>
-		<SubView Id="Power6" Name="Power6" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="825"/>
-		<SubView Id="Power7" Name="Power7" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="826"/>
-		<SubView Id="Power8" Name="Power8" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="827"/>
-		<SubView Id="Power9" Name="Power9" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="828"/>
-		<SubView Id="Power10" Name="Power10" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="829"/>
-		<SubView Id="Power11" Name="Power11" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="831"/>
-		<SubView Id="Power12" Name="Power12" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="832"/>
-		<SubView Id="Power13" Name="Power13" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="833"/>
-		<SubView Id="Power14" Name="Power14" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="834"/>
-		<SubView Id="CMMPower1" Name="CMMPower1" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="835"/>
+		<SubView Id="Power2" Name="Power2" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8211"/>
+		<SubView Id="Power3" Name="Power3" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8221"/>
+		<SubView Id="Power4" Name="Power4" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8231"/>
+		<SubView Id="Power5" Name="Power5" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8241"/>
+		<SubView Id="Power6" Name="Power6" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8251"/>
+		<SubView Id="Power7" Name="Power7" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8261"/>
+		<SubView Id="Power8" Name="Power8" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8271"/>
+		<SubView Id="Power9" Name="Power9" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8281"/>
+		<SubView Id="Power10" Name="Power10" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8291"/>
+		<SubView Id="Power11" Name="Power11" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8311"/>
+		<SubView Id="Power12" Name="Power12" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8321"/>
+		<SubView Id="Power13" Name="Power13" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8331"/>
+		<SubView Id="Power14" Name="Power14" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8341"/>
+		<SubView Id="CMMPower1" Name="CMMPower1" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8351"/>
 	</Navigation>
 
 	<Navigation Id="Temperature" Name="Temperature" >

+ 2 - 2
CyberX8_Themes/UserControls/LockControl.xaml

@@ -16,7 +16,7 @@
                     <Setter Property="Background" Value="LimeGreen"/>
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding ElementName=self, Path=IsLocked}" Value="False">
-                            <Setter Property="Background" Value="red"/>
+                            <Setter Property="Background" Value="Gray"/>
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
@@ -30,7 +30,7 @@
                         <Setter Property="Canvas.Top" Value="13.875"/>
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding ElementName=self, Path=IsLocked}" Value="False">
-                                <Setter Property="Stroke" Value="red"/>
+                                <Setter Property="Stroke" Value="Gray"/>
                                 <Setter Property="Canvas.Top" Value="8.875"/>
                             </DataTrigger>