From 0f71990dc60af6e96c9f4c2f2095ca6711e2c870 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期一, 06 七月 2020 11:29:37 +0800
Subject: [PATCH] merge
---
src/Bro.Device.GTSCard/GTSCardDriver.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/Bro.Device.GTSCard/GTSCardDriver.cs b/src/Bro.Device.GTSCard/GTSCardDriver.cs
index ee9c6b9..adba5c9 100644
--- a/src/Bro.Device.GTSCard/GTSCardDriver.cs
+++ b/src/Bro.Device.GTSCard/GTSCardDriver.cs
@@ -323,13 +323,13 @@
if (IConfig.AxisSettings.FirstOrDefault(a => a.AxisIndex == optionPara.AxisIndex)?.IsAxisEnabled ?? false)
{
string _position = "";
- string motionType = optionPara.MoveMode == EnumHelper.MotorMoveMode.Normal ? (optionPara.IsAbsolute ? "Abs" : "Rel") : optionPara.MoveMode.ToString();
+ string motionType = optionPara.MoveMode == EnumHelper.MotionMode.Normal ? (optionPara.IsAbsolute ? "Abs" : "Rel") : optionPara.MoveMode.ToString();
_position = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff},{optionPara.AxisIndex},{motionType},{GetPosition(optionPara.AxisIndex)},{GetPrfPosition(optionPara.AxisIndex)},{optionPara.Destination},";
switch (optionPara.MoveMode)
{
- case MotorMoveMode.Normal:
+ case MotionMode.Normal:
{
if (_isResetting)
{
@@ -348,12 +348,12 @@
}
break;
- case MotorMoveMode.FindOri:
+ case MotionMode.FindOri:
{
isSuccessAndStop = GoHome(optionPara);
}
break;
- case MotorMoveMode.Jog:
+ case MotionMode.Jog:
{
isSuccessAndStop = JogMove(optionPara);
}
--
Gitblit v1.8.0