revise srd releated

PunkHPX8_MainPages/Views/SrdRecipeView.xaml

@@ -85,7 +85,7 @@
                                     <UserControls:GroupTextBoxControl Grid.Row="0" Grid.Column="1" Title="Max Water Pressure" Unit="psi" MinValue="0" MaxValue="80" IntValue="{Binding Recipe.MaxWaterPressure,Mode=TwoWay}" ValidResult="{Binding PropertyValidResultDic[MaxWaterPressure],Mode=TwoWay}" Width="290"/>
                                     <UserControls:GroupTextBoxControl Grid.Row="2" Title="Flow Check Delay" Unit="sec" MinValue="0" MaxValue="60" IntValue="{Binding Recipe.FlowCheckDelay,Mode=TwoWay}" ValidResult="{Binding PropertyValidResultDic[FlowCheckDelay],Mode=TwoWay}" Width="290"/>
                                     <UserControls:GroupTextBoxControl Grid.Row="1" Grid.Column="1" Title="Min Water Pressure" Unit="psi" MinValue="0" MaxValue="50" IntValue="{Binding Recipe.MinWaterPressure,Mode=TwoWay}" ValidResult="{Binding PropertyValidResultDic[MinWaterPressure],Mode=TwoWay}" Width="290" />
-                                    <UserControls:GroupTextBoxControlDouble Grid.Row="2" Grid.Column="1" Title="Max SRD Water Flow" Unit="L/min" MinValue="0" MaxValue="2.5" DoubleValue="{Binding Recipe.MaxSRDWaterFlow,Mode=TwoWay}" ValidResult="{Binding PropertyValidResultDic[MaxSRDWaterFlow],Mode=TwoWay}" Width="290" />
+                                    <UserControls:GroupTextBoxControlDouble Grid.Row="2" Grid.Column="1" Title="Max SRD Water Flow" Unit="L/min" MinValue="0" MaxValue="5" DoubleValue="{Binding Recipe.MaxSRDWaterFlow,Mode=TwoWay}" ValidResult="{Binding PropertyValidResultDic[MaxSRDWaterFlow],Mode=TwoWay}" Width="290" />
                                     <UserControls:GroupTextBoxControlDouble Grid.Row="3" Grid.Column="1" Title="Min SRD Water Flow" Unit="L/min" MinValue="0" MaxValue="2.5" DoubleValue="{Binding Recipe.MinSRDWaterFlow,Mode=TwoWay}" ValidResult="{Binding PropertyValidResultDic[MinSRDWaterFlow],Mode=TwoWay}" Width="290" />
                                 </Grid>
                             </GroupBox>

PunkHPX8_RT/Config/Devices/Beckhoffcfg - plctask.xml

@@ -111,7 +111,7 @@
 		
 		<!--SRD inputs Start-->
 		<Input Name="r_SRD_FLUID_LEVEL"  Address="MAIN.SRD_DI_16CHANNEL_EL1819_N600_1" Invert="false" Type="Digital" DataType="bool"/>
-		<Input Name="r_SRD_SUPPLY_WATER_PRESS"  Address="MAIN.SRD_AI_8CHANNEL_4_20mA_EL3058_604_3" Scaling="0=3276.7,50=32767" Type="Analog" DataType="int"/>
+		<Input Name="r_SRD_SUPPLY_WATER_PRESS"  Address="MAIN.SRD_AI_8CHANNEL_4_20mA_EL3058_604_3" Scaling="0=0,50=32767" Type="Analog" DataType="int"/>
 		<!--SRD inputs End-->
 		
 
@@ -129,7 +129,7 @@
 		<Input Name="r_SRD1_200_FLIPPER3_OUT"  Address="MAIN.SRD_DI_16CHANNEL_EL1819_N600_13" Invert="false" Type="Digital" DataType="bool"/>
 
 		<Input Name="r_SRD1_CHUCK_VACUUM_anlg"  Address="MAIN.SRD_AI_8CHANNEL_4_10V_EL3058_605_1" Scaling="-757.5=3276.7,757.5=16383.5"  Type="Analog" DataType="int"/>
-		<Input Name="r_SRD1_WATER_FLOW"  Address="MAIN.SRD_AI_8CHANNEL_4_20mA_EL3058_604_1" Scaling="0=3276.7,2.5=32767" Type="Analog" DataType="int"/>
+		<Input Name="r_SRD1_WATER_FLOW"  Address="MAIN.SRD_AI_8CHANNEL_4_20mA_EL3058_604_1" Scaling="0=0,4=32767" Type="Analog" DataType="int"/>
 		<!--SRD1 inputs End-->
 		
 		<!--SRD2 inputs Start-->
@@ -146,7 +146,7 @@
 		<Input Name="r_SRD2_200_FLIPPER3_OUT"  Address="MAIN.SRD_DI_16CHANNEL_EL1819_N601_12" Invert="false" Type="Digital" DataType="bool"/>
 
 		<Input Name="r_SRD2_CHUCK_VACUUM_anlg"  Address="MAIN.SRD_AI_8CHANNEL_4_10V_EL3058_605_2" Scaling="-757.5=3276.7,757.5=16383.5"  Type="Analog" DataType="int"/>
-		<Input Name="r_SRD2_WATER_FLOW"  Address="MAIN.SRD_AI_8CHANNEL_4_20mA_EL3058_604_1" Scaling="0=3276.7,2.5=32767" Type="Analog" DataType="int"/>
+		<Input Name="r_SRD2_WATER_FLOW"  Address="MAIN.SRD_AI_8CHANNEL_4_20mA_EL3058_604_1" Scaling="0=0,4=32767" Type="Analog" DataType="int"/>
 		<!--SRD2 inputs End-->
 		
 		

PunkHPX8_Themes/UserControls/SRDSideControl.xaml

@@ -58,7 +58,7 @@
         </Grid>
 
         <Grid Grid.Row="2" Grid.Column="0">
-            <Label  Content="Loader DI" FontSize="16" FontWeight="Bold" HorizontalAlignment="Left" VerticalContentAlignment="Center" VerticalAlignment="Center"/>
+            <Label  Content="SRD DIW" FontSize="16" FontWeight="Bold" HorizontalAlignment="Left" VerticalContentAlignment="Center" VerticalAlignment="Center"/>
         </Grid>
         <Grid Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left" Width="50">
             <Ellipse Grid.Column="1" Width="16" Height="16" HorizontalAlignment="Right" VerticalAlignment="Center" Stroke="Silver" Fill="{Binding LoaderDiEnable,Converter={StaticResource boolToColor}}"/>

PunkHPX8_Twincate/PunkHPX8/PlcTest/POUs/MAIN.TcPOU

@@ -564,7 +564,7 @@ VAR
 	//SRD.FluidContainment
 	SRD_DI_16CHANNEL_EL1819_N600_1 AT%I* :BOOL;
 	//SRD.WaterPressure
-	SRD_AI_8CHANNEL_4_20mA_EL3058_604_3 AT%I* :DINT;
+	SRD_AI_8CHANNEL_4_20mA_EL3058_604_3 AT%I* :DINT:=10000;
 	
 	//SRD1.DoorClosed
 	SRD_DI_16CHANNEL_EL1819_N600_7 AT%I* :BOOL;
@@ -1171,10 +1171,10 @@ ELSE
 END_IF
 
 //SRD1 water  and SRD2 water flow is public
-IF SRD_DO_16CHANNEL_EL2809_N602_5=TRUE OR SRD_DO_16CHANNEL_EL2809_N602_13=TRUE THEN
-	SRD_AI_8CHANNEL_4_20mA_EL3058_604_1:= 30000;
+IF VPW_PNEU_SMC_EX260_BYTE2.7=TRUE THEN
+	SRD_AI_8CHANNEL_4_20mA_EL3058_604_1:= 10000;
 ELSE
-	SRD_AI_8CHANNEL_4_20mA_EL3058_604_1:= 3277;
+	SRD_AI_8CHANNEL_4_20mA_EL3058_604_1:= 0;
 END_IF