From f39f00ee0ee41e169fa24ccb85b4af36090dbd25 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期三, 08 七月 2020 16:38:51 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Device.GTSCard/GTSCardDriver.cs | 316 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 226 insertions(+), 90 deletions(-)
diff --git a/src/Bro.Device.GTSCard/GTSCardDriver.cs b/src/Bro.Device.GTSCard/GTSCardDriver.cs
index 3368e83..918ed22 100644
--- a/src/Bro.Device.GTSCard/GTSCardDriver.cs
+++ b/src/Bro.Device.GTSCard/GTSCardDriver.cs
@@ -37,6 +37,13 @@
/// </summary>
bool _isResetting = false;
+ /// <summary>
+ /// 杩愬姩杞寸珛鍗虫殏鍋�
+ /// </summary>
+ Dictionary<int, ManualResetEvent> axisImmediatePauseHandleDict = new Dictionary<int, ManualResetEvent>();
+
+ Dictionary<int, CancellationTokenSource> axisMoveCancelDict = new Dictionary<int, CancellationTokenSource>();
+
public void SetResetFlag(bool isReset)
{
_isResetting = isReset;
@@ -44,7 +51,17 @@
public override List<AxisInfo> GetCurrentAxisInfo(params string[] axisName)
{
- throw new NotImplementedException();
+ List<AxisInfo> axisInfos = new List<AxisInfo>();
+ IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled).ForEach(axisSetting =>
+ {
+ AxisInfo axisInfo = new AxisInfo();
+ axisInfo.AxisName = axisSetting.AxisName;
+ var axisMovingStatus = AxisMovingOptionValues.FirstOrDefault(u => u.AxisIndex == axisSetting.AxisIndex);
+ axisInfo.AxisLocation = axisMovingStatus == null ? 0 : Convert.ToDouble(axisMovingStatus.CurPosition);
+
+ axisInfos.Add(axisInfo);
+ });
+ return axisInfos;
}
#region DeviceBase
@@ -52,16 +69,23 @@
protected override void Init()
{
InitialMotionCard();
+ axisImmediatePauseHandleDict = IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled).ToDictionary(a => a.AxisIndex, a => new ManualResetEvent(true));
+ axisMoveCancelDict = IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled).ToDictionary(a => a.AxisIndex, a => new CancellationTokenSource());
+
+ axisMoveCancelDict.Values.ToList().ForEach(c =>
+ {
+ c = new CancellationTokenSource();
+ });
}
protected override void Pause()
{
- throw new NotImplementedException();
+
}
protected override void Resume()
{
- throw new NotImplementedException();
+
}
protected override void Start()
@@ -76,27 +100,46 @@
}
/// <summary>
- /// 璁惧 杩愯
+ /// 璁惧 杩愯锛堟墽琛� 鏉垮崱绯诲垪鐨勬搷浣滅殑 闆嗗悎锛�
/// </summary>
/// <param name="config"></param>
/// <returns></returns>
public override ResponseMessage Run(IOperationConfig config)
{
ResponseMessage responseMessage = new ResponseMessage();
- var opConfig = config as GTSCardOperationConfig;
+ if (config is MotionCardOperationConfigBase motionCardOperationConfig)
+ {
+ foreach (var operationSet in motionCardOperationConfig.OperationCollection)
+ {
+ responseMessage = RunOperationSet(operationSet);
+ if (!responseMessage.Result)
+ {
+ return responseMessage;
+ }
+ }
+ }
+ return responseMessage;
+ }
+
+ /// <summary>
+ /// 鎵ц 涓�涓郴鍒楃殑鎿嶄綔
+ /// </summary>
+ private ResponseMessage RunOperationSet(MotionCardOperationSet operationSet)
+ {
+ ResponseMessage responseMessage = new ResponseMessage();
// 1.棰勬鏌�
if (CurrentState == DeviceState.DSOpen)
{
- foreach (var preCheck in opConfig.PreCheckIOCollection)
+ foreach (var preCheck in operationSet.PreCheckIOCollection)
{
- int timeout = opConfig.PreCheckIOTimeout;
- int? ioData = null;
+ int timeout = operationSet.PreCheckIOTimeout;
+ IOValue? ioData = null;
while (CurrentState == DeviceState.DSOpen)
{
Thread.Sleep(10);
ioData = MonitorValues.FirstOrDefault(u => u.IONum == preCheck.IOItem.IONum && u.IOType == preCheck.IOItem.IOType)?.Value;//IO 鏄紑銆佸叧 浠嶮onitorValues 鑾峰彇
timeout -= 10;
- if (preCheck.CheckValue == ioData || (opConfig.PreCheckIOTimeout > 0 && timeout < 0))
+ if (preCheck.CheckValue == ioData || (operationSet.PreCheckIOTimeout > 0 && timeout < 0))
{
break;
}
@@ -114,8 +157,7 @@
// 2.鏉垮崱杩愬姩
if (CurrentState == DeviceState.DSOpen)
{
- responseMessage = MoveToPoint(opConfig);
-
+ responseMessage = MoveToPoint(operationSet.MotionOperationCollection);
if (!responseMessage.Result)
{
return responseMessage;
@@ -126,7 +168,7 @@
// 3.IO杈撳嚭 涓嶉渶瑕佽秴鏃�
if (CurrentState == DeviceState.DSOpen)
{
- foreach (var ioOutput in opConfig.IOOutputCollection)
+ foreach (var ioOutput in operationSet.IOOutputCollection)
{
var ioData = MonitorValues.FirstOrDefault(u => u.IONum == ioOutput.IOItem.IONum && u.IOType == ioOutput.IOItem.IOType)?.Value;//IO 鏄紑銆佸叧 浠嶮onitorValues 鑾峰彇
if (ioOutput.CheckValue != ioData)
@@ -141,16 +183,16 @@
// 4.IO纭
if (CurrentState == DeviceState.DSOpen)
{
- foreach (var ioConfirm in opConfig.IOConfirmCollection)
+ foreach (var ioConfirm in operationSet.IOConfirmCollection)
{
- int timeout = opConfig.IOConfirmTimeout;
- int? ioData = null;
+ int timeout = operationSet.IOConfirmTimeout;
+ IOValue? ioData = null;
while (CurrentState == DeviceState.DSOpen)
{
Thread.Sleep(10);
ioData = MonitorValues.FirstOrDefault(u => u.IONum == ioConfirm.IOItem.IONum && u.IOType == ioConfirm.IOItem.IOType)?.Value;//IO 鏄紑銆佸叧 浠嶮onitorValues 鑾峰彇
timeout -= 10;
- if (ioConfirm.CheckValue == ioData || (opConfig.IOConfirmTimeout > 0 && timeout < 0))
+ if (ioConfirm.CheckValue == ioData || (operationSet.IOConfirmTimeout > 0 && timeout < 0))
{
break;
}
@@ -169,6 +211,43 @@
}
#endregion
+ #region ImmediatePause
+ /// <summary>
+ /// 鍚姩绔嬪嵆鏆傚仠
+ /// </summary>
+ public void SetImmediatePause()
+ {
+ if (!_isResetting)
+ {
+ var immediatePauseAxis = IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled && a.IsImmediatePause).Select(u => u.AxisIndex).ToList();
+
+ immediatePauseAxis.ForEach(async axisIndex =>
+ {
+ axisImmediatePauseHandleDict[axisIndex].Reset();
+
+ axisMoveCancelDict[axisIndex].Cancel();
+
+ await MoveStop(axisIndex, 0);
+ });
+ }
+ }
+
+ /// <summary>
+ /// 鎭㈠绔嬪嵆鏆傚仠
+ /// </summary>
+ public void ResetImmediatePause()
+ {
+ var immediatePauseAxis = IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled && a.IsImmediatePause).Select(u => u.AxisIndex).ToList();
+
+ immediatePauseAxis.ForEach(axisIndex =>
+ {
+ axisMoveCancelDict[axisIndex] = new CancellationTokenSource();
+
+ axisImmediatePauseHandleDict[axisIndex].Set();
+ });
+ }
+ #endregion
+
#region GTSCard
/// <summary>
@@ -180,7 +259,7 @@
{
var res = GTSCardAPI.GT_Open((short)IConfig.CardNum, 0, 1); //鎵撳紑杩愬姩鎺у埗鍣ㄣ�傚弬鏁板繀椤讳负锛�0,1锛夛紝涓嶈兘淇敼銆�
res += GTSCardAPI.GT_LoadConfig((short)IConfig.CardNum, IConfig.InitialConfigFilePath);
- res += GTSCardAPI.GT_ClrSts(0, 1, 8);
+ ClearStatus(1, IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled).Count);
if (res != (short)GTSRetCode.GRCRunOK)
{
throw new Exception("鏉垮崱杞藉叆閰嶇疆鏂囦欢寮傚父锛岄敊璇爜锛�" + res);
@@ -188,13 +267,13 @@
}
- public bool AllAxisOn()
+ public override bool AllAxisOn()
{
List<Task<bool>> taskList = new List<Task<bool>>(); ;
// 濡傛灉鏄涓酱鐨勮繍鍔� 绛夋瘡涓酱寮�鍚�
- IConfig.AxisSettings.Where(a => a.IsAxisEnabled).ToList().ForEach(axisNum =>
+ IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled).ForEach(axisNum =>
{
- var task = AxisOnAsync((short)IConfig.CardNum, (short)axisNum.AxisIndex);
+ var task = AxisOnAsync(axisNum.AxisIndex);
taskList.Add(task);
});
Task.WaitAll(taskList.ToArray());
@@ -202,13 +281,13 @@
return resultOK;
}
- public bool AllAxisOff()
+ public override bool AllAxisOff()
{
List<Task<bool>> taskList = new List<Task<bool>>(); ;
// 濡傛灉鏄涓酱鐨勮繍鍔� 绛夋瘡涓酱鍏抽棴
- IConfig.AxisSettings.Where(a => a.IsAxisEnabled).ToList().ForEach(axisNum =>
+ IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled).ForEach(axisNum =>
{
- var task = AxisOffAsync((short)IConfig.CardNum, (short)axisNum.AxisIndex);
+ var task = AxisOffAsync(axisNum.AxisIndex);
taskList.Add(task);
});
Task.WaitAll(taskList.ToArray());
@@ -220,11 +299,11 @@
/// 鍗曚釜杞村紑鍚�
/// </summary>
/// <returns></returns>
- public async Task<bool> AxisOnAsync(short cardNum, short axisNum)
+ public override async Task<bool> AxisOnAsync(int axisNum)
{
return await Task.Run(() =>
{
- var ret = GTSCardAPI.GT_AxisOn(cardNum, axisNum);
+ var ret = GTSCardAPI.GT_AxisOn((short)IConfig.CardNum, (short)axisNum);
return ret == (short)GTSRetCode.GRCRunOK;
});
}
@@ -233,11 +312,11 @@
/// 鍗曚釜杞村叧闂�
/// </summary>
/// <returns></returns>
- public async Task<bool> AxisOffAsync(short cardNum, short axisNum)
+ public override async Task<bool> AxisOffAsync(int axisNum)
{
return await Task.Run(() =>
{
- var ret = GTSCardAPI.GT_AxisOff(cardNum, axisNum);
+ var ret = GTSCardAPI.GT_AxisOff((short)IConfig.CardNum, (short)axisNum);
return ret == (short)GTSRetCode.GRCRunOK;
});
}
@@ -250,24 +329,21 @@
public override ResponseMessage MoveToPoint(IOperationConfig opConfig)
{
ResponseMessage responseMessage = new ResponseMessage();
- var gtsOperationConfig = opConfig as GTSCardOperationConfig;
- List<Task<bool>> taskList = new List<Task<bool>>();
- //TaskFactory factory = new TaskFactory(TaskCreationOptions.LongRunning, TaskContinuationOptions.None);
- // 濡傛灉鏄涓酱鐨勮繍鍔� 绛夋瘡涓酱杩愬姩缁撴潫
- foreach (var movingOp in gtsOperationConfig.MovingOps)
+ if (opConfig is MotionOperationCollection gtsOperationCollection)
{
- //var task = factory.StartNew<bool>((op) =>
- //{
- // return SingleAxisMoving(op as MovingOption);
- //}, movingOp);
- var task = SingleAxisMoving(movingOp);
- taskList.Add(task);
- }
- Task.WaitAll(taskList.ToArray());
- responseMessage.Result = taskList.All(u => u.GetAwaiter().GetResult());
- if (!responseMessage.Result)
- {
- responseMessage.Message = $"鐐逛綅杩愬姩寮傚父";
+ List<Task<bool>> taskList = new List<Task<bool>>();
+ foreach (var movingOp in gtsOperationCollection.MovingOps)
+ {
+ var task = SingleAxisMoving(movingOp);
+ taskList.Add(task);
+ }
+
+ Task.WaitAll(taskList.ToArray());
+ responseMessage.Result = taskList.All(u => u.GetAwaiter().GetResult());
+ if (!responseMessage.Result)
+ {
+ responseMessage.Message = $"鐐逛綅杩愬姩寮傚父";
+ }
}
return responseMessage;
}
@@ -302,7 +378,7 @@
/// 鍗曚釜杞� 杩愬姩(鐐瑰埌鐐� jog 鍥為浂...锛�
/// </summary>
/// <param name="optionPara">杩愬姩鍙傛暟瀵硅薄</param>
- public async Task<bool> SingleAxisMoving(MovingOption optionPara)
+ public override async Task<bool> SingleAxisMoving(MovingOption optionPara)
{
return await Task.Run(() =>
{
@@ -311,14 +387,16 @@
{
if (IConfig.AxisSettings.FirstOrDefault(a => a.AxisIndex == optionPara.AxisIndex)?.IsAxisEnabled ?? false)
{
+ axisImmediatePauseHandleDict[optionPara.AxisIndex].WaitOne();
+
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)
{
@@ -337,12 +415,12 @@
}
break;
- case MotorMoveMode.FindOri:
+ case MotionMode.FindOri:
{
isSuccessAndStop = GoHome(optionPara);
}
break;
- case MotorMoveMode.Jog:
+ case MotionMode.Jog:
{
isSuccessAndStop = JogMove(optionPara);
}
@@ -402,6 +480,41 @@
}
/// <summary>
+ /// 鑾峰彇瑙勫垝閫熷害
+ /// </summary>
+ /// <param name="axisNum">Axis number</param>
+ /// <returns></returns>
+ public double GetPrfVelocity(int axisNum)
+ {
+ double prfVel = 0;
+ uint pclock = 0;
+ var ret = GTSCardAPI.GT_GetPrfVel((short)IConfig.CardNum, (short)axisNum, out prfVel, 1, out pclock);
+ if (ret != (short)GTSRetCode.GRCRunOK)
+ {
+ throw new Exception("杞�" + axisNum + "鑾峰彇瑙勫垝閫熷害寮傚父锛岄敊璇爜锛�" + ret);
+ }
+ prfVel = prfVel / IConfig.AxisVelocityRatio;
+ return prfVel;
+ }
+
+ /// <summary>
+ /// 鑾峰彇褰撳墠閫熷害
+ /// </summary>
+ /// <param name="axisNum">Axis number</param>
+ /// <returns></returns>
+ public double GetVelocity(int axisNum)
+ {
+ double vel = 0;
+ var ret = GTSCardAPI.GT_GetVel((short)IConfig.CardNum, (short)axisNum, out vel);
+ if (ret != (short)GTSRetCode.GRCRunOK)
+ {
+ throw new Exception("杞�" + axisNum + "鑾峰彇褰撳墠閫熷害寮傚父锛岄敊璇爜锛�" + ret);
+ }
+ vel = vel / IConfig.AxisVelocityRatio;
+ return vel;
+ }
+
+ /// <summary>
/// Set Single Axis Do Jog Move
/// </summary>
/// <param name="axisNum">AxisNo</param>
@@ -426,7 +539,7 @@
if (ret != (short)GTSRetCode.GRCRunOK)
{
- LogAsync(DateTime.Now, "杞�" + optionPara.AxisIndex + "APS_absolute_move寮傚父", "閿欒鐮侊細" + ret + ";" + "閲嶈瘯娆℃暟锛�" + repeatTime);
+ LogAsync(DateTime.Now, "杞�" + optionPara.AxisIndex + "JogMove寮傚父", "閿欒鐮侊細" + ret + ";" + "閲嶈瘯娆℃暟锛�" + repeatTime);
Thread.Sleep(10);
}
repeatTime--;
@@ -439,29 +552,6 @@
OnExceptionRaised?.Invoke(ex);
return false;
}
-
- }
-
- /// <summary>
- /// Set Single Axis Do stop Jog Move
- /// </summary>
- /// <param name="axisNum">AxisNo</param>
- /// <returns></returns>
- public bool StopJog(int axisNum)
- {
- //鍋滄杩愬姩
- MoveStop(axisNum, 0);
- //杩愬姩寮�濮嬪悗 妫�鏌ヨ繍鍔ㄦ槸鍚﹀仠姝�
- bool isStop = false;
- int repeatTime = 1000;
- do
- {
- isStop = IsStop((short)IConfig.CardNum, (short)axisNum);
- Thread.Sleep(50);
- repeatTime--;
- } while (!isStop && repeatTime > 0);
-
- return isStop;
}
/// <summary>
@@ -529,7 +619,7 @@
repeatTime = 1000;
do
{
- isStop = IsStop((short)IConfig.CardNum, (short)optionPara.AxisIndex);
+ isStop = IsStop((short)optionPara.AxisIndex);
Thread.Sleep(50);
repeatTime--;
} while (!isStop && repeatTime > 0);
@@ -552,6 +642,8 @@
{
try
{
+ axisImmediatePauseHandleDict[optionPara.AxisIndex].WaitOne();
+
if (_isResetting)
{
LogAsync(DateTime.Now, "澶嶄綅杩囩▼寮傚父", "杞�" + optionPara.AxisIndex + "璇曞浘鍦ㄥ浣嶈繃绋嬩腑杩愬姩");
@@ -601,7 +693,7 @@
repeatTime = 1000;
do
{
- isStop = IsStop((short)IConfig.CardNum, (short)optionPara.AxisIndex);
+ isStop = IsStop((short)optionPara.AxisIndex);
Thread.Sleep(50);
repeatTime--;
} while (!isStop && repeatTime > 0);
@@ -622,7 +714,7 @@
/// <param name="axisNum">axisNo</param>
/// <param name="option">0琛ㄧず骞虫粦鍋滄锛�1琛ㄧず绱ф�ュ仠姝�</param>
/// <returns></returns>
- public async Task<bool> MoveStop(int axisNum, int option)
+ public override async Task<bool> MoveStop(int axisNum, int option)
{
return await Task.Run(() =>
{
@@ -644,7 +736,7 @@
int repeatTime = 100;
do
{
- isStop = IsStop((short)IConfig.CardNum, (short)axisNum);
+ isStop = IsStop((short)axisNum);
Thread.Sleep(10);
repeatTime--;
} while (!isStop && repeatTime > 0);
@@ -756,17 +848,17 @@
/// </summary>
/// <param name="index">杈撳嚭鍙�,杩斿洖1-16</param>
/// <param name="value">false琛ㄧず杈撳嚭锛宼rue琛ㄧず鍏抽棴</param>
- public override void WriteOutput(short cardNum, short index, IOValue value)
+ public override void WriteOutput(short index, IOValue value)
{
short outNum = (short)(index % 100 + 1);
if ((int)value <= 1)
{
- GTSCardAPI.GT_SetDoBit(cardNum, GTSCardAPI.MC_GPO, outNum, (short)value);
+ GTSCardAPI.GT_SetDoBit((short)IConfig.CardNum, GTSCardAPI.MC_GPO, outNum, (short)value);
}
else
{
var currentValue = (int)MonitorValues.FirstOrDefault(u => u.IONum == outNum && u.IOType == IOType.OUTPUT).Value;
- GTSCardAPI.GT_SetDoBit(cardNum, GTSCardAPI.MC_GPO, outNum, (short)(currentValue == 1 ? 0 : 1));
+ GTSCardAPI.GT_SetDoBit((short)IConfig.CardNum, GTSCardAPI.MC_GPO, outNum, (short)(currentValue == 1 ? 0 : 1));
}
}
@@ -776,23 +868,65 @@
/// <param name="cardNum">鏉垮崱鍙�</param>
/// <param name="axisNum">杞村彿</param>
/// <returns></returns>
- public bool IsStop(short cardNum, short axisNum)
+ public bool IsStop(short axisNum)
+ {
+ int sts = GetAxisStatus(axisNum);
+ if ((sts & 0x400) == 0) return true;//鍋滄杩斿洖true
+ else return false; //杩愯涓繑鍥瀎alse
+ }
+
+ /// <summary>
+ /// 璇诲彇杞寸姸鎬�
+ /// </summary>
+ /// <param name="axisNum">杞村彿</param>
+ /// <returns></returns>
+ public override int GetAxisStatus(int axisNum)
{
lock (moveLock)
{
int sts = 0;
uint pclock = 0;
- GTSCardAPI.GT_GetSts(cardNum, axisNum, out sts, 1, out pclock);
- if ((sts & 0x400) == 0) return true;//鍋滄杩斿洖true
- else return false; //杩愯涓繑鍥瀎alse
+ GTSCardAPI.GT_GetSts((short)IConfig.CardNum, (short)axisNum, out sts, 1, out pclock);
+ return sts;
}
+ }
+
+ public override bool ClearStatus(int startAxisIndex, int count)
+ {
+ var rtn = GTSCardAPI.GT_ClrSts((short)IConfig.CardNum, (short)startAxisIndex, (short)count);
+ return rtn == (short)GTSRetCode.GRCRunOK;
+ }
+
+ public override bool PositionReset(int startAxisIndex, int count)
+ {
+ var rtn = GTSCardAPI.GT_ZeroPos((short)IConfig.CardNum, (short)startAxisIndex, (short)count);
+ return rtn == (short)GTSRetCode.GRCRunOK;
}
#endregion
#region IMonitor
- //public List<IOItem> MonitorValues { get; set; } = new List<IOItem>();
+ public List<AxisMovingStatus> GetAxisMovingStatus()
+ {
+ List<AxisMovingStatus> axisMovingStatusesList = new List<AxisMovingStatus>();
+ foreach (var axisConfig in IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled))
+ {
+ AxisMovingStatus axisMovingStatus = new AxisMovingStatus();
+ axisMovingStatus.AxisIndex = axisConfig.AxisIndex;
+ axisMovingStatus.AxisName = axisConfig.AxisName;
+ 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.AxisStatus = GetAxisStatus(axisMovingStatus.AxisIndex);
+
+ axisMovingStatusesList.Add(axisMovingStatus);
+
+ }
+
+ return axisMovingStatusesList;
+ }
public List<IOItem> GetMonitorValues()
@@ -838,7 +972,8 @@
if (!IConfig.IsEnableMonitor)
return;
var newValues = GetMonitorValues();
- if (newValues == null || newValues.Count == 0)
+ var newAxisMovingStatus = GetAxisMovingStatus();
+ if (newValues == null || newValues.Count == 0 || newAxisMovingStatus == null || newAxisMovingStatus.Count == 0)
continue;
Stopwatch sw = new Stopwatch();
@@ -849,6 +984,8 @@
var tempOld = MonitorValues.DeepSerializeClone();
MonitorCheckAndInvoke(tempNew, tempOld);
}
+
+ AxisMovingOptionValues = new List<AxisMovingStatus>(newAxisMovingStatus);
MonitorValues = new List<IOItem>(newValues);
sw.Stop();
@@ -954,12 +1091,11 @@
public override void ResetAlarm()
{
int axis_sts;
- uint clk;
var axisSettings = IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled);
- GTSCardAPI.GT_ClrSts((short)IConfig.CardNum, 1, (short)axisSettings.Count);
+ ClearStatus(1, axisSettings.Count);
foreach (var axisSetting in axisSettings)
{
- GTSCardAPI.GT_GetSts((short)IConfig.CardNum, (short)axisSetting.AxisIndex, out axis_sts, 1, out clk);
+ axis_sts = GetAxisStatus((short)axisSetting.AxisIndex);
if ((axis_sts & 0x200) == 0)
{
var rst = GTSCardAPI.GT_AxisOn((short)IConfig.CardNum, (short)axisSetting.AxisIndex);
@@ -990,7 +1126,7 @@
}
// 娓呴櫎鐘舵��
- GTSCardAPI.GT_ClrSts((short)IConfig.CardNum, 1, (short)IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled).Count);
+ ClearStatus(1, axisSettings.Count);
}
object _alarmLock = new object();
--
Gitblit v1.8.0