revise srd releated

PunkHPX8_MainPages/ViewModels/SRDHomePageViewModel.cs

@@ -27,7 +27,7 @@ namespace PunkHPX8_MainPages.ViewModels
         private const string WAFER_PRESENCE_STATUS = "WaferPresenceStatus";
         private const string SRD = "srd";
         private const string WAFER_HOLDER= "WaferHolder";
-        private const string LOADER_DI_ENABLE = "LoaderDiEnable";
+        private const string SRD_DI_ENABLE = "SrdDiwEnable";
         private const string FACILITIES = "Facilities";
         private const string MOTION_DATA = "MotionData";
         private const double ARM_UI_HOME_POSITION = 25.682;
@@ -544,7 +544,7 @@ namespace PunkHPX8_MainPages.ViewModels
             _rtDataKeys.Add($"{Module}.WaferInfo");
             _rtDataKeys.Add($"{Module}.IsPresenceTesting");
             _rtDataKeys.Add($"{Module}.IsWaferPresence");
-            _rtDataKeys.Add($"System.{FACILITIES}.{LOADER_DI_ENABLE}");
+            _rtDataKeys.Add($"System.{FACILITIES}.{SRD_DI_ENABLE}");
             _rtDataKeys.Add($"{Module}.Arm.{MOTION_DATA}");
             _rtDataKeys.Add($"{Module}.Rotation.{MOTION_DATA}");
             _rtDataKeys.Add($"Station.{Module}.Arm");
@@ -589,7 +589,7 @@ namespace PunkHPX8_MainPages.ViewModels
                 {
                     SRDCommonData = CommonFunction.GetValue<SrdCommonData>(_rtDataValueDic, $"{Module}.{COMMON_DATA}");
                     SRDPersistent = CommonFunction.GetValue<SRDPersistentValue>(_rtDataValueDic, $"{Module}.{PERSISTENT_VALUE}");
-                    LoaderDiEnable = CommonFunction.GetValue<bool>(_rtDataValueDic, $"System.{FACILITIES}.{LOADER_DI_ENABLE}");
+                    LoaderDiEnable = CommonFunction.GetValue<bool>(_rtDataValueDic, $"System.{FACILITIES}.{SRD_DI_ENABLE}");
                     AchievedRunRecipeCycle = CommonFunction.GetValue<int>(_rtDataValueDic, $"{Module}.AchievedCycle");
                     WaferPresence = CommonFunction.GetValue<string>(_rtDataValueDic, $"{Module}.{WAFER_PRESENCE_STATUS}");
                     State = CommonFunction.GetValue<string>(_rtDataValueDic, $"{Module}.FsmState");
@@ -653,9 +653,6 @@ namespace PunkHPX8_MainPages.ViewModels
                     Flipper150UIPosition[0] = SRDCommonData.Flipper1Out150Status ? FLIPPER_OUT_POSITION : FLIPPER_IN_POSITION;
                     Flipper150UIPosition[1] = SRDCommonData.Flipper2Out150Status ? FLIPPER_OUT_POSITION : FLIPPER_IN_POSITION;
                     Flipper150UIPosition[2] = SRDCommonData.Flipper3Out150Status ? FLIPPER_OUT_POSITION : FLIPPER_IN_POSITION;
-                    //Flipper100UIPosition[0] = SRDCommonData.Flipper1Out100Status ? FLIPPER_OUT_POSITION : FLIPPER_IN_POSITION;
-                    //Flipper100UIPosition[1] = SRDCommonData.Flipper2Out100Status ? FLIPPER_OUT_POSITION : FLIPPER_IN_POSITION;
-                    //Flipper100UIPosition[2] = SRDCommonData.Flipper3Out100Status ? FLIPPER_OUT_POSITION : FLIPPER_IN_POSITION;
                 }
             }
         }

PunkHPX8_MainPages/ViewModels/SRDMotionViewModel.cs

@@ -240,8 +240,8 @@ namespace PunkHPX8_MainPages.ViewModels
                         tmp2.ProfileVelocity = Math.Round(tmp2.ProfileVelocity / 6, 2);
                         tmp2.HomingVelocity = Math.Round(tmp2.HomingVelocity / 6, 2);
                         tmp2.HomingVelocitySlow = Math.Round(tmp2.HomingVelocitySlow / 6, 2);
-                        tmp2.ProfileDecel = tmp2.ProfileDecel * ACCEL_FACTOR;
-                        tmp2.ProfileAccel = tmp2.ProfileAccel * ACCEL_FACTOR;
+                        tmp2.ProfileDecel = tmp2.ProfileDecel;
+                        tmp2.ProfileAccel = tmp2.ProfileAccel;
                     }
                     SRD2RotationMotionData = tmp2;
 

PunkHPX8_RT/Config/Devices/AxisProviderCfg.xml

@@ -6,7 +6,7 @@
     <Units>deg</Units>
 	<!-- 5294 X 4 counts/rev * 1/360 rev/deg = 58.822222 counts/deg -->
     <ScaleFactor>91</ScaleFactor>
-    <JogLimit>5</JogLimit>
+    <JogLimit>1000000</JogLimit>
     <!--Units>rev</Units-->
 	<!-- 5294 X 4 counts/rev = 21176 counts/rev -->
     <!--ScaleFactor>21176</ScaleFactor-->

PunkHPX8_RT/Devices/DeviceManager.cs

@@ -95,7 +95,7 @@ namespace PunkHPX8_RT.Instances
             {
                 JetAxisBase rotationAxis = AxisManager.Instance.GetAxisInstance(rotationBeckhoffAxis.MotorType, moduleName.ToString(), "Rotation");
                 AddCustomModuleDevice(rotationAxis);
-                rotationAxis.InterLock = new VpwRotationAxisInterLock(rotationAxis);
+                rotationAxis.InterLock = new SrdRotationAxisInterLock(rotationAxis);
                 AxisManager.Instance.AddModuleAxis(moduleName.ToString(), rotationAxis);
             }
             SrdCommonDevice srdCommon = new SrdCommonDevice(moduleName.ToString());

PunkHPX8_RT/Modules/SRD/SRDEntity.cs

@@ -694,7 +694,7 @@ namespace PunkHPX8_RT.Modules.SRD
             {
                 double elapsedMilliseconds = _processRecipeRoutine.ElapsedMilliseconds;
                 int recipeTime = (int)Math.Floor(elapsedMilliseconds / _cycle / 1000);
-                CellItemRecipeTimeManager.Instance.UpdateRecipeTime(_currentRecipe.Ppid, recipeTime);
+                CellItemRecipeTimeManager.Instance.UpdateRecipeTime(_currentRecipe.Ppid, recipeTime);//更新recipe的完成时间
                 //记录LotTrack
                 _runRecipeCompleteTime = DateTime.Now;
                 _processRecipeRoutine.SRDLotTrackHeaderDatas.ProcessTime = (_runRecipeCompleteTime - _runRecipeStartTime).TotalSeconds.ToString("F2");

PunkHPX8_Themes/UserControls/SRDSideControl.xaml

@@ -68,10 +68,10 @@
                 <RowDefinition/>
                 <RowDefinition/>
             </Grid.RowDefinitions>
-            <Button Style="{StaticResource SysBtnStyle}" Margin="30,8,0,8" Height="25" Width="100" HorizontalAlignment="Left" Content="On" Click="LoaderDIOn_Click" Grid.RowSpan="2"/>
+            <Button Style="{StaticResource SysBtnStyle}" Margin="30,8,0,8" Height="25" Width="100" HorizontalAlignment="Left" Content="On" Click="SrdDIOn_Click" Grid.RowSpan="2"/>
         </Grid>
         <Grid Grid.Row="2" Grid.Column="3">
-            <Button Style="{StaticResource SysBtnStyle}" Margin="10,0,0,0" Grid.Column="1" Height="25" Width="100" HorizontalAlignment="Center" Content="Off" Click="LoaderDIOff_Click"></Button>
+            <Button Style="{StaticResource SysBtnStyle}" Margin="10,0,0,0" Grid.Column="1" Height="25" Width="100" HorizontalAlignment="Center" Content="Off" Click="SrdDIOff_Click"></Button>
         </Grid>
 
         <Grid Grid.Row="3" Grid.Column="0">

PunkHPX8_Themes/UserControls/SRDSideControl.xaml.cs

@@ -174,14 +174,14 @@ namespace PunkHPX8_Themes.UserControls
             InvokeClient.Instance.Service.DoOperation($"{ModuleName}.Common.ChuckVacuumOn");
         }
 
-        private void LoaderDIOff_Click(object sender, RoutedEventArgs e)
+        private void SrdDIOff_Click(object sender, RoutedEventArgs e)
         {
-            InvokeClient.Instance.Service.DoOperation($"System.Facilities.LoaderDiDisable");
+            InvokeClient.Instance.Service.DoOperation($"System.Facilities.SrdDiwDisable");
         }
 
-        private void LoaderDIOn_Click(object sender, RoutedEventArgs e)
+        private void SrdDIOn_Click(object sender, RoutedEventArgs e)
         {
-            InvokeClient.Instance.Service.DoOperation($"System.Facilities.LoaderDiEnable");
+            InvokeClient.Instance.Service.DoOperation($"System.Facilities.SrdDiwEnable");
         }
 
         private void WaterOff_Click(object sender, RoutedEventArgs e)