Merge branch 'master' of http://106.15.194.121:8083/liutao/1069_MIMO_PlUS

DeviceLibrary/DeviceLibrary/AxisBean.cs

@@ -310,7 +310,9 @@ namespace DeviceLibrary
             {
             {
                 targetSpeed = Config.TargetSpeed * targetSpeed;
                 targetSpeed = Config.TargetSpeed * targetSpeed;
             }
             }
-            AxisManager.RelMove(Config.DeviceName, Config.GetAxisValue(), targetPos, (int)targetSpeed, (int)targetSpeed * 4, (int)targetSpeed * 4);// , Config.AddSpeed, Config.DelSpeed);
+            var AddSpeed = Config.AddSpeed > 0 ? Config.AddSpeed : (int)targetSpeed * 4;
+            var DelSpeed = Config.DelSpeed > 0 ? Config.DelSpeed : (int)targetSpeed * 4;
+            AxisManager.RelMove(Config.DeviceName, Config.GetAxisValue(), targetPos, (int)targetSpeed, AddSpeed, DelSpeed);// , Config.AddSpeed, Config.DelSpeed);
 
 
         }
         }
         public bool IsBusy {
         public bool IsBusy {