Ver código fonte

update save position

chenkui 1 mês atrás
pai
commit
f7f2222d35

+ 8 - 2
CyberX8_RT/Devices/AXIS/JetAxisBase.cs

@@ -1059,14 +1059,20 @@ namespace CyberX8_RT.Devices.AXIS
                 {
                     _targetPosition = result.position;
                     int targetPosition = (int)Math.Round(result.position*_scaleFactor, 0);
+                    bool positionResult = false;
                     if (velocity != 0)
                     {
-                        return ProfilePosition(targetPosition, velocity, acceleration, deceleration, judgeTorqueLimit);
+                        positionResult= ProfilePosition(targetPosition, velocity, acceleration, deceleration, judgeTorqueLimit);
                     }
                     else
                     {
-                        return ProfilePosition(targetPosition, _profileVelocity, _profileAcceleration, _profileDeceleration, judgeTorqueLimit);
+                        positionResult= ProfilePosition(targetPosition, _profileVelocity, _profileAcceleration, _profileDeceleration, judgeTorqueLimit);
                     }
+                    if (positionResult)
+                    {
+                        MotionData.TargetPosition = _targetPosition;
+                    }
+                    return positionResult;
                 }
                 LOG.WriteLog(eEvent.ERR_AXIS, Module, $"{targetStation} not in list,cannot goto fixed position");
                 return false;

+ 1 - 5
CyberX8_Themes/UserControls/LoaderStationPositionControl.xaml.cs

@@ -31,10 +31,6 @@ namespace CyberX8_Themes.UserControls
     {
         #region 内部变量
         /// <summary>
-        /// Wafer尺寸
-        /// </summary>
-        private int _waferSize = 0;
-        /// <summary>
         /// 步进
         /// </summary>
         private double _incrementValue;
@@ -313,7 +309,7 @@ namespace CyberX8_Themes.UserControls
 
         private void MotorPos_Click(object sender, RoutedEventArgs e)
         {
-            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.Save", $"{ModuleSelectedItem}.{_waferSize}", Math.Round(CurrentPosition, 2));
+            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.Save", $"{ModuleSelectedItem}", Math.Round(CurrentPosition, 2));
             SavedPosition = CurrentPosition;
             foreach (Station item in _axis.Stations)
             {

+ 2 - 7
CyberX8_Themes/UserControls/PufStationPositionControl.xaml.cs

@@ -30,10 +30,6 @@ namespace CyberX8_Themes.UserControls
     {
         #region 内部变量
         /// <summary>
-        /// Wafer尺寸
-        /// </summary>
-        private int _waferSize = 0;
-        /// <summary>
         /// 步进
         /// </summary>
         private double _incrementValue;
@@ -307,7 +303,7 @@ namespace CyberX8_Themes.UserControls
 
         private void MotorPos_Click(object sender, RoutedEventArgs e)
         {
-            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.Save", $"{ModuleSelectedItem}.{_waferSize}", Math.Round(CurrentPosition, 2));
+            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.Save", $"{ModuleSelectedItem}", Math.Round(CurrentPosition, 2));
             SavedPosition = CurrentPosition;
             foreach (Station item in _axis.Stations)
             {
@@ -405,8 +401,7 @@ namespace CyberX8_Themes.UserControls
             {
                 if (!string.IsNullOrEmpty(ModuleName))
                 {
-                    _rtDataKeys.Clear();_waferSize = (int)QueryDataClient.Instance.Service.GetConfig("System.WaferSize");
-                    
+                    _rtDataKeys.Clear();
                     IncrementValue = (double)QueryDataClient.Instance.Service.GetConfig("System.Increment");
                     _rtDataKeys.Add($"Station.{ModuleName}");
                     _rtDataKeys.Add($"{ModuleName}.AxisProvider");