From c0d59e233882ad489f45abc8eb0193ffa4fb8988 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期六, 11 七月 2020 11:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Device.GTSCard/GTSCardDriver.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/Bro.Device.GTSCard/GTSCardDriver.cs b/src/Bro.Device.GTSCard/GTSCardDriver.cs
index 6b701a8..3bf8ec1 100644
--- a/src/Bro.Device.GTSCard/GTSCardDriver.cs
+++ b/src/Bro.Device.GTSCard/GTSCardDriver.cs
@@ -96,6 +96,8 @@
protected override void Start()
{
AllAxisOn();
+
+ base.Start();
}
protected override void Stop()
@@ -857,7 +859,7 @@
/// <param name="value">false琛ㄧず杈撳嚭锛宼rue琛ㄧず鍏抽棴</param>
public override void WriteOutput(short index, IOValue value)
{
- short outNum = (short)(index % 100);
+ short outNum = (short)(index % 100 + 1);
if ((int)value <= 1)
{
GTSCardAPI.GT_SetDoBit((short)IConfig.CardNum, GTSCardAPI.MC_GPO, outNum, (short)value);
@@ -931,10 +933,10 @@
AxisMovingStatus axisMovingStatus = new AxisMovingStatus();
axisMovingStatus.AxisIndex = axisConfig.AxisIndex;
axisMovingStatus.AxisName = axisConfig.AxisName;
- axisMovingStatus.CurPosition = Convert.ToInt32(GetPosition(axisMovingStatus.AxisIndex));
+ //axisMovingStatus.CurPosition = Convert.ToInt32(GetPosition(axisMovingStatus.AxisIndex));
axisMovingStatus.Destination = Convert.ToInt32(GetPrfPosition(axisMovingStatus.AxisIndex));
- axisMovingStatus.CurVelocity = GetVelocity(axisMovingStatus.AxisIndex);
- axisMovingStatus.PrfVelocity = GetPrfVelocity(axisMovingStatus.AxisIndex);
+ //axisMovingStatus.CurVelocity = GetVelocity(axisMovingStatus.AxisIndex);
+ //axisMovingStatus.PrfVelocity = GetPrfVelocity(axisMovingStatus.AxisIndex);
axisMovingStatus.AxisStatus = GetAxisStatus(axisMovingStatus.AxisIndex);
axisMovingStatusesList.Add(axisMovingStatus);
@@ -956,7 +958,7 @@
GTSCardAPI.GT_GetDo((short)IConfig.CardNum, GTSCardAPI.MC_GPO, out outValue);
//瑙ｆ瀽缁撴灉
- for (var index = 1; index <= 16; index++)
+ for (var index = 0; index < 16; index++)
{
IOItem inItem = new IOItem()
{
--
Gitblit v1.8.0