revise vpw releated bug

PunkHPX8_MainPages/Views/DepRecipeView.xaml

@@ -64,7 +64,7 @@
             <ComboBox Height="30" Margin="10,0,10,0" ItemsSource="{Binding ChemistryList}" SelectedItem="{Binding Recipe.Chemistry, Mode=TwoWay}">
             </ComboBox>
         </GroupBox>
-        <GroupBox Header="Total Time" IsEnabled="{Binding Enable}"  Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="2" Margin="-75,60,500,20" Width="180">
+        <GroupBox Header="Total Time" IsEnabled="{Binding Enable}"  Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="2" Margin="0,60,390,20" Width="180">
             <Label Content="{Binding Recipe.TotalTime}" Height="30" Width="180" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" Background="Gray" 
                            HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Grid.Column="1" Margin="6,0,0,0"></Label>
         </GroupBox>
@@ -72,7 +72,7 @@
             <Grid.RowDefinitions>
                 <RowDefinition Height="70"></RowDefinition>
                 <RowDefinition Height="70"></RowDefinition>
-                <RowDefinition/>
+                <RowDefinition Height="35"/>
                 <RowDefinition Height="70"></RowDefinition>
             </Grid.RowDefinitions>
             <Grid Grid.Row="0">
@@ -236,7 +236,7 @@
                                             <RowDefinition Height="80"></RowDefinition>
                                         </Grid.RowDefinitions>
                                         <GroupBox Header="Number of Smart Sping" Grid.Row="0" Margin="10,10,10,10"  IsEnabled="{Binding Enable}" >
-                                            <TextBox Text="{Binding Recipe.DepStepCount}" Height="30" Width="175" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White"  
+                                            <TextBox Text="{Binding Recipe.NumberOfSmartSping}" Height="30" Width="175" VerticalAlignment="Center" HorizontalAlignment="Left"
                                                 HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Grid.Column="1" Margin="18,0,0,0"></TextBox>
                                         </GroupBox>
                                         <UserControls:GroupTextBoxControl  Grid.Row="1"  Width="260" Title="Section 1 Speed" Unit="rpm" MinValue="0" MaxValue="100" Margin="10,0,10,0"
@@ -259,9 +259,9 @@
                                                 <Label Grid.Row="1" Grid.Column="4" Content="360"></Label>
                                                 <Label Grid.Row="0" Grid.Column="1" Content="Start" Margin="5,-3,0,0"></Label>
                                                 <Label Grid.Row="0" Grid.Column="3" Content="End" Margin="35,-3,0,0"></Label>
-                                                <TextBox Text="{Binding Recipe.Section1AngleStartPosiotion,Mode=TwoWay}"  IsEnabled="{Binding Enable}"  Grid.Row="1" Grid.Column="1" Height="30" Width="50" VerticalAlignment="Top" HorizontalAlignment="Left" Foreground="White"  
+                                                <TextBox Text="{Binding Recipe.Section1AngleStartPosiotion,Mode=TwoWay}"  IsEnabled="{Binding Enable}"  Grid.Row="1" Grid.Column="1" Height="30" Width="50" VerticalAlignment="Top" HorizontalAlignment="Left" 
                                                         HorizontalContentAlignment="Center" VerticalContentAlignment="Center"></TextBox>
-                                                <TextBox Text="{Binding Recipe.Section1AngleEndPostion,Mode=TwoWay}"  IsEnabled="{Binding Enable}"  Grid.Row="1" Grid.Column="3" Margin="0,0,5,0" Height="30" Width="50" VerticalAlignment="Top" HorizontalAlignment="Right" Foreground="White"
+                                                <TextBox Text="{Binding Recipe.Section1AngleEndPostion,Mode=TwoWay}"  IsEnabled="{Binding Enable}"  Grid.Row="1" Grid.Column="3" Margin="0,0,5,0" Height="30" Width="50" VerticalAlignment="Top" HorizontalAlignment="Right"
                         HorizontalContentAlignment="Center" VerticalContentAlignment="Center"></TextBox>
                                             </Grid>
                                         </GroupBox>
@@ -285,9 +285,9 @@
                                                 <Label Grid.Row="1" Grid.Column="4" Content="360"></Label>
                                                 <Label Grid.Row="0" Grid.Column="1" Content="Start" Margin="5,-3,0,0"></Label>
                                                 <Label Grid.Row="0" Grid.Column="3" Content="End" Margin="35,-3,0,0"></Label>
-                                                <TextBox Text="{Binding Recipe.Section2AngleStartPosiotion,Mode=TwoWay}"  IsEnabled="{Binding Enable}"  Grid.Row="1" Grid.Column="1" Height="30" Width="50" VerticalAlignment="Top" HorizontalAlignment="Left" Foreground="White" 
+                                                <TextBox Text="{Binding Recipe.Section2AngleStartPosiotion,Mode=TwoWay}"  IsEnabled="{Binding Enable}"  Grid.Row="1" Grid.Column="1" Height="30" Width="50" VerticalAlignment="Top" HorizontalAlignment="Left" 
                                 HorizontalContentAlignment="Center" VerticalContentAlignment="Center"></TextBox>
-                                                <TextBox Text="{Binding Recipe.Section2AngleEndPostion,Mode=TwoWay}"  IsEnabled="{Binding Enable}"  Grid.Row="1" Grid.Column="3" Margin="0,0,5,0" Height="30" Width="50" VerticalAlignment="Top" HorizontalAlignment="Right" Foreground="White" 
+                                                <TextBox Text="{Binding Recipe.Section2AngleEndPostion,Mode=TwoWay}"  IsEnabled="{Binding Enable}"  Grid.Row="1" Grid.Column="3" Margin="0,0,5,0" Height="30" Width="50" VerticalAlignment="Top" HorizontalAlignment="Right"
 HorizontalContentAlignment="Center" VerticalContentAlignment="Center"></TextBox>
                                             </Grid>
                                         </GroupBox>

PunkHPX8_MainPages/Views/PlatingCellHomePageView.xaml

@@ -211,16 +211,16 @@
                         <Label Content="Feedback" FontSize="12" FontWeight="Bold"   Margin="8,0,0,0" VerticalContentAlignment="Center" HorizontalContentAlignment="Left"/>
                     </Grid>
                     <Border Grid.Row="1" Grid.Column="1"  Margin="5,5,5,5" Background="Black">
-                        <TextBlock  Text="{Binding PowerSupplierData.Current, StringFormat=\{0:F2\}}"  Foreground="Lime" FontSize="16" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <TextBlock  Text="{Binding PowerSupplierData.SetPoint, StringFormat=\{0:F2\}}"  Foreground="Lime" FontSize="16" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                     </Border>
                     <Border Grid.Row="1" Grid.Column="2"  Margin="5,5,25,5" Background="Black">
-                        <TextBlock   Text="L/min"  Foreground="Lime" FontSize="16" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                        <TextBlock   Text="{Binding PowerSupplierData.Current, StringFormat=\{0:F2\}}"  Foreground="Lime" FontSize="16" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center"/>
                     </Border>
                     <Border Grid.Row="2" Grid.Column="1"  Margin="5,5,5,5" Background="Black">
                         <TextBlock  Text="{Binding PowerSupplierData.Voltage, StringFormat=\{0:F2\}}"  Foreground="Lime" FontSize="16" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                     </Border>
                     <Border Grid.Row="2" Grid.Column="2"  Margin="5,5,25,5" Background="Black">
-                        <TextBlock   Text="mm"  Foreground="Lime" FontSize="16" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                        <TextBlock   Text="{Binding PowerSupplierData.Voltage, StringFormat=\{0:F2\}}"  Foreground="Lime" FontSize="16" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center"/>
                     </Border>
 
                 </Grid>

PunkHPX8_MainPages/Views/VpwRecipeView.xaml

@@ -102,7 +102,7 @@
                 <ColumnDefinition Width="350"></ColumnDefinition>
                 <ColumnDefinition Width="350"></ColumnDefinition>
             </Grid.ColumnDefinitions>
-            <GroupBox  Header="1.Vacuum Prewet" Grid.Column="3"  Padding="10" Grid.Row="0" Grid.RowSpan="2">
+            <GroupBox  Header="1.Vacuum Prewet" Grid.Column="1"  Padding="10" Grid.Row="0" Grid.RowSpan="2">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="75"></RowDefinition>
@@ -235,7 +235,7 @@ Command="{Binding AutoCurrentBasedFalseCommand}"  IsChecked="{Binding Recipe.Vac
                 </Grid>
             </GroupBox>
 
-            <GroupBox  Header="2.Vent Prewet" Grid.Column="1"  Padding="10" Grid.Row="0" Grid.RowSpan="2">
+            <GroupBox  Header="2.Vent Prewet" Grid.Column="2"  Padding="10" Grid.Row="0" Grid.RowSpan="2">
                 <Grid Margin="0,0,0,0">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="45"></RowDefinition>
@@ -306,7 +306,7 @@ Command="{Binding AutoCurrentBasedFalseCommand}"  IsChecked="{Binding Recipe.Ven
                 </Grid>
             </GroupBox>
 
-            <GroupBox  Header="3.Extend Clean" Grid.Column="2"  Padding="10" Grid.Row="0" Grid.RowSpan="2">
+            <GroupBox  Header="3.Extend Clean" Grid.Column="3"  Padding="10" Grid.Row="0" Grid.RowSpan="2">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="45"></RowDefinition>

PunkHPX8_RT/Config/Devices/AxisProviderCfg.xml

@@ -57,7 +57,7 @@
     <!-- <Driver>Sim</Driver> -->
     <Units>mm</Units>
     <!-- Old gear head ScaleFactor>47784.1</ScaleFactor-->
-    <ScaleFactor>1</ScaleFactor>
+    <ScaleFactor>1000000</ScaleFactor>
     <JogLimit>25</JogLimit>
 	<MinMoveTime>1.0</MinMoveTime>
     <Inputs>

PunkHPX8_RT/Config/Devices/Beckhoffcfg.xml

@@ -741,8 +741,10 @@
 		<Axis Name="PlatingCell1_2.Vertical" MotorType="Yaskawa" COEAddress="192.168.0.14.4.1" COEPort="1016" DebugLogging="false">
 			<Input Address="Task 2.Inputs.PlatingCell1_2Vertical_StatusWord" Type="StatusWord" DataType="uint"/>
 			<Input Address="Task 2.Inputs.PlatingCell1_2Vertical_DigitalInputs" Type="DigitalInputs" DataType="udint"/>
+			<Input Address="Task 2.Inputs.PlatingCell1_2Vertical_ModeOfOperationDisplay" Type="ModeOfOperation" DataType="byte"/>
 			<Input Address="Task 2.Inputs.PlatingCell1_2Vertical_ActualMotorPosition" Type="MotorPosition" DataType="dint"/>
 			<Input Address="Task 2.Inputs.PlatingCell1_2Vertical_FollowingErrorActualValue" Type="PositionError" DataType="dint"/>
+			<Input Address="Task 2.Inputs.PlatingCell1_2Vertical_InternalPositionActual" Type="InternalPositionActual" DataType="dint"/>
 			<Input Address="Task 2.Inputs.PlatingCell1_2Vertical_VelocityActualValue" Type="ActualVelocity" DataType="dint"/>
 			<Input Address="Task 2.Inputs.PlatingCell1_2Vertical_TorqueActualValue" Type="ActualTorque" DataType="short"/>
 			<Input Address="0x607d:01" Type="SoftwareLimitMinus" DataType="dint"/>
@@ -827,8 +829,10 @@
 		<Axis Name="PlatingCell3_4.Vertical" MotorType="Yaskawa" COEAddress="192.168.0.14.4.1" COEPort="1016" DebugLogging="false">
 			<Input Address="Task 2.Inputs.PlatingCell3_4Vertical_StatusWord" Type="StatusWord" DataType="uint"/>
 			<Input Address="Task 2.Inputs.PlatingCell3_4Vertical_DigitalInputs" Type="DigitalInputs" DataType="udint"/>
+			<Input Address="Task 2.Inputs.PlatingCell3_4Vertical_ModeOfOperationDisplay" Type="ModeOfOperation" DataType="byte"/>
 			<Input Address="Task 2.Inputs.PlatingCell3_4Vertical_ActualMotorPosition" Type="MotorPosition" DataType="dint"/>
 			<Input Address="Task 2.Inputs.PlatingCell3_4Vertical_FollowingErrorActualValue" Type="PositionError" DataType="dint"/>
+			<Input Address="Task 2.Inputs.PlatingCell3_4Vertical_InternalPositionActual" Type="InternalPositionActual" DataType="dint"/>
 			<Input Address="Task 2.Inputs.PlatingCell3_4Vertical_VelocityActualValue" Type="ActualVelocity" DataType="dint"/>
 			<Input Address="Task 2.Inputs.PlatingCell3_4Vertical_TorqueActualValue" Type="ActualTorque" DataType="short"/>
 			<Input Address="0x607d:01" Type="SoftwareLimitMinus" DataType="dint"/>

PunkHPX8_RT/Modules/VpwCell/VpwCellEntity.cs

@@ -272,7 +272,7 @@ namespace PunkHPX8_RT.Modules.VpwMain
             //Cycle Manual Process
             Transition(VPWCellState.Idle, VPWCellMsg.CycleProcessRecipe, CycleManualProcess, VPWCellState.CycleManualProcessing);
             Transition(VPWCellState.CycleManualProcessing, FSM_MSG.TIMER, CycleManualMonitor, VPWCellState.Idle);
-            Transition(VPWCellState.CycleManualProcessing, VPWCellMsg.Abort, RunRecipeAbort, VPWCellState.Idle);
+            Transition(VPWCellState.CycleManualProcessing, VPWCellMsg.Abort, RunRecipeAbort, VPWCellState.Aborting);
             //Prepare
             Transition(VPWCellState.Idle, VPWCellMsg.Prepare, Prepare, VPWCellState.Preparing);
             Transition(VPWCellState.Preparing, FSM_MSG.TIMER, PrepareMonitor, VPWCellState.WaitForRunRecipe);

PunkHPX8_RT/Modules/VpwMain/VpwMainEntity.cs

@@ -163,6 +163,7 @@ namespace PunkHPX8_RT.Modules.VpwMain
             Transition(VPWMainState.Error, VPWMainMsg.EnterIdle, NullFunc, VPWMainState.Idle);
             Transition(VPWMainState.Init, VPWMainMsg.EnterIdle, NullFunc, VPWMainState.Idle);
             Transition(VPWMainState.Idle, VPWMainMsg.EnterIdle, NullFunc, VPWMainState.Idle);
+            Transition(VPWMainState.Aborting, VPWMainMsg.EnterIdle, NullFunc, VPWMainState.Idle);
             //Enter Init
             Transition(VPWMainState.Idle, VPWMainMsg.Init, NullFunc, VPWMainState.Init);
             //Purge
@@ -308,7 +309,7 @@ namespace PunkHPX8_RT.Modules.VpwMain
                     }
                 }
             }
-            return true;
+            return result;
         }
 
         

PunkHPX8_Themes/UserControls/PlatingCellStatusControl.xaml

@@ -16,6 +16,7 @@
         <converters:BoolToColor6 x:Key="boolToColor6"></converters:BoolToColor6>
         <converters:BoolToBool x:Key="boolToBool"></converters:BoolToBool>
     </UserControl.Resources>
+    <GroupBox Header="Plating Cell Control">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="40"/>
@@ -126,4 +127,5 @@
             <TextBlock  Text="mm" Foreground="Lime" FontSize="16" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Left"/>
         </Border>
     </Grid>
+    </GroupBox>
 </UserControl>