Browse Source

update axis stop routine

chenkui 2 days ago
parent
commit
2fff18b027

+ 1 - 1
PunkHPX8_RT/Devices/AXIS/CanOpen/CanOpenAxis.cs

@@ -96,7 +96,7 @@ namespace PunkHPX8_RT.Devices.AXIS.CANOpen
                 else if (_currentOperation == MotionOperation.Home)
                 {
                     _homeRoutine.Abort();
-                    _status = _homeRoutine.Start();
+                    _status = _stopPositionRoutine.Start();
                     _currentOperation = MotionOperation.StopPosition;
                 }
                 else

+ 0 - 4
PunkHPX8_RT/Devices/AXIS/GalilRotation/GalilRotationAxis.cs

@@ -47,10 +47,6 @@ namespace PunkHPX8_RT.Devices.AXIS.GalilLipsel
         /// Stop Position
         /// </summary>
         private GalilRotationStopPositionRoutine _stopPositionRoutine;
-        /// <summary>
-        /// Axis Operation Locker
-        /// </summary>
-        private readonly object _operationLocker = new object();
 
         /// <summary>
         /// Galil共用对象

+ 1 - 1
PunkHPX8_RT/Devices/AXIS/Kollmorgen/KollmorgenAxis.cs

@@ -97,7 +97,7 @@ namespace PunkHPX8_RT.Devices.AXIS.Kollmorgen
                 else if (_currentOperation == MotionOperation.Home)
                 {
                     _homeRoutine.Abort();
-                    _status = _homeRoutine.Start();
+                    _status = _stopPositionRoutine.Start();
                     _currentOperation = MotionOperation.StopPosition;
                 }
                 else

+ 1 - 1
PunkHPX8_RT/Devices/AXIS/Maxon/MaxonAxis.cs

@@ -98,7 +98,7 @@ namespace PunkHPX8_RT.Devices.AXIS.CANOpen
                 else if (_currentOperation == MotionOperation.Home)
                 {
                     _homeRoutine.Abort();
-                    _status = _homeRoutine.Start();
+                    _status = _stopPositionRoutine.Start();
                     _currentOperation = MotionOperation.StopPosition;
                 }
                 else

+ 1 - 1
PunkHPX8_RT/Devices/AXIS/Yaskawa/YaskawaAxis.cs

@@ -96,7 +96,7 @@ namespace PunkHPX8_RT.Devices.AXIS.Yaskawa
                 else if (_currentOperation == MotionOperation.Home)
                 {
                     _homeRoutine.Abort();
-                    _status = _homeRoutine.Start();
+                    _status = _stopPositionRoutine.Start();
                     _currentOperation = MotionOperation.StopPosition;
                 }
                 else

+ 1 - 1
PunkHPX8_RT/Modules/VpwCell/VpwVacuumPrewetRoutine.cs

@@ -392,7 +392,7 @@ namespace PunkHPX8_RT.Modules.VpwCell
             {
                 maxSpeed= _recipe.SpinSpeed;
             }
-            targetPosition = maxSpeed * (second + 60 * 1000);//按最大速度*(时间+多出一分钟)
+            targetPosition = maxSpeed * (second + 60);//按最大速度*(时间+多出一分钟)
             _vpwCellDevice.SetRotationSpeed(_recipe.VacuumRinseStep[0].RotationSpeed * 6);
             return _vpwCellDevice.RotationProfilePosition(targetPosition);
         }