From 78584911d0457ad9fc26d9dfc6f374b7ef531c0f Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期日, 22 十一月 2020 13:45:09 +0800
Subject: [PATCH] 1. 添加操作员输入和界面显示 2. 添加通过输入窗体 3. 添加webservice调用帮助类 4. M071添加MES数据检查和数据上传功能，添加相关界面显示和流程控制
---
src/Bro.Device.GTSCard/GTSCardDriver.cs | 158 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 134 insertions(+), 24 deletions(-)
diff --git a/src/Bro.Device.GTSCard/GTSCardDriver.cs b/src/Bro.Device.GTSCard/GTSCardDriver.cs
index c430886..dbea577 100644
--- a/src/Bro.Device.GTSCard/GTSCardDriver.cs
+++ b/src/Bro.Device.GTSCard/GTSCardDriver.cs
@@ -99,6 +99,9 @@
{
AllAxisOn();
+ MonitorPosition();
+ MonitorAxisStatus();
+
base.Start();
}
@@ -523,7 +526,7 @@
/// <returns></returns>
public double GetPosition(int axisNum)
{
- lock (moveLock)
+ //lock (moveLock)
{
double position = 0;
double pPos = 0;
@@ -888,6 +891,8 @@
{
try
{
+ Thread.CurrentThread.Priority = ThreadPriority.AboveNormal;
+
var goHomePara = IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == movingOption.AxisIndex).GoHomePara;
bool homeDirection = goHomePara.IsHomeDirPositive;
bool isRightLimitReached = false;
@@ -904,34 +909,56 @@
// 璁剧疆鐐逛綅妯″紡杩愬姩鍙傛暟
sRtn = GTSCardAPI.GT_SetTrapPrm((short)IConfig.CardNum, (short)movingOption.AxisIndex, ref trapPrm);
// 璁剧疆鐐逛綅妯″紡鐩爣閫熷害锛屽嵆鍥炲師鐐归�熷害
- sRtn = GTSCardAPI.GT_SetVel((short)IConfig.CardNum, (short)movingOption.AxisIndex, goHomePara.HighVelocity);
+ sRtn = GTSCardAPI.GT_SetVel((short)IConfig.CardNum, (short)movingOption.AxisIndex, goHomePara.HomeVelocity);
do
{
PositionReset(movingOption.AxisIndex, 1);
ClearStatus(movingOption.AxisIndex, 1);
- //鎼滅储璺濈 闃舵1
- // 鍚姩Home鎹曡幏
- sRtn = GTSCardAPI.GT_SetCaptureMode((short)IConfig.CardNum, (short)movingOption.AxisIndex, GTSCardAPI.CAPTURE_HOME);
+ //LogAsync(DateTime.Now, $"{Name}浣嶇疆缃浂", "");
+
+ if (goHomePara.IsCaptureMode)
+ {
+ //鎼滅储璺濈 闃舵1
+ // 鍚姩Home鎹曡幏
+ sRtn = GTSCardAPI.GT_SetCaptureMode((short)IConfig.CardNum, (short)movingOption.AxisIndex, GTSCardAPI.CAPTURE_HOME);
+ }
// 璁剧疆鐐逛綅妯″紡鐩爣浣嶇疆锛屽嵆鍘熺偣鎼滅储璺濈
- sRtn = GTSCardAPI.GT_SetPos((short)IConfig.CardNum, (short)movingOption.AxisIndex, homeDirection ? 99999999 : -99999999);
+ sRtn = GTSCardAPI.GT_SetPos((short)IConfig.CardNum, (short)movingOption.AxisIndex, homeDirection ? 999999999 : -999999999);
// 鍚姩杩愬姩
sRtn = GTSCardAPI.GT_Update((short)IConfig.CardNum, 1 << (movingOption.AxisIndex - 1));
int repeatTime = goHomePara.GoHomeTimeOut * 1000;
bool isStop = false;
- int pos;
+ int pos = 0;
uint clk;//鏃堕挓鍙傛暟
+
+ int checkInterval = IConfig.MonitorInterval;
+ if (IConfig.MonitorInterval <= 0)
+ {
+ checkInterval = 10;
+ }
+
do
{
- Thread.Sleep(IConfig.MonitorInterval * 5);
- // 璇诲彇鎹曡幏鐘舵��
- GTSCardAPI.GT_GetCaptureStatus((short)IConfig.CardNum, (short)movingOption.AxisIndex, out capture, out pos, 1, out clk);
+ Thread.Sleep(checkInterval);
+
+ if (goHomePara.IsCaptureMode)
+ {
+ // 璇诲彇鎹曡幏鐘舵��
+ GTSCardAPI.GT_GetCaptureStatus((short)IConfig.CardNum, (short)movingOption.AxisIndex, out capture, out pos, 1, out clk);
+ }
+ else
+ {
+ GTSCardAPI.GT_GetDi((short)IConfig.CardNum, GTSCardAPI.MC_HOME, out int pValue);
+ capture = (short)((pValue & (1 << (movingOption.AxisIndex - 1))) == 0 ? 1 : 0);
+ //LogAsync(DateTime.Now, $"鍘熺偣鐘舵�亄pValue}锛岃酱{movingOption.AxisIndex}鍘熺偣{capture}", "");
+ }
isStop = IsStop((short)movingOption.AxisIndex);
- repeatTime -= IConfig.MonitorInterval * 5;
+ repeatTime -= checkInterval;
} while (!(isStop || capture == 1 || repeatTime <= 0));
if (repeatTime <= 0)
@@ -942,11 +969,16 @@
var axisStatus = AxisStatusList.FirstOrDefault(u => u.AxisIndex == movingOption.AxisIndex);
+ //if (isStop)
+ //{
+ // LogAsync(DateTime.Now, $"杞磠movingOption.AxisIndex}澶嶄綅涓仠姝�", $"Capture鐘舵�亄capture}");
+ //}
+
if (isStop && capture != 1)
{
if (((axisStatus.AxisStatus & 0x20) != 0) || ((axisStatus.AxisStatus & 0x40) != 0))
{
- //movingOption.GoHomePara.HomeDir = (short)(movingOption.GoHomePara.HomeDir == 1 ? -1 : 1);
+ capture = 0;
//姝ｉ檺浣�
if ((axisStatus.AxisStatus & 0x20) != 0 && !goHomePara.IsCaptureDirPositive)
@@ -961,6 +993,8 @@
}
homeDirection = !homeDirection;
+
+ LogAsync(DateTime.Now, $"杞磠movingOption.AxisIndex}鏋侀檺浣嶇疆鎹㈠悜", "");
}
ClearStatus(movingOption.AxisIndex, 1);
@@ -995,14 +1029,18 @@
repeatTime--;
} while (!isStop && repeatTime > 0);
PositionReset(movingOption.AxisIndex, 1);
+ LogAsync(DateTime.Now, $"杞磠movingOption.AxisIndex}澶嶄綅瀹屾垚锛屼綅缃竻闆�", "");
+
return (sRtn == (short)GTSRetCode.GRCRunOK) && isStop;
}
} while (!(capture == 1 && isRightLimitReached));
+
return false;
}
catch (Exception ex)
{
+ LogAsync(DateTime.Now, $"{Name}鍥炲師鐐瑰紓甯�", ex.GetExceptionMessage());
AllMoveStop(true);
OnExceptionOccured?.Invoke(DateTime.Now, ex);
return false;
@@ -1076,7 +1114,7 @@
/// <returns></returns>
public override int GetAxisStatus(int axisNum)
{
- lock (moveLock)
+ //lock (moveLock)
{
int sts = 0;
uint pclock = 0;
@@ -1099,7 +1137,7 @@
/// <returns></returns>
public override bool PositionReset(int startAxisIndex, int count)
{
- lock (moveLock)
+ //lock (moveLock)
{
var rtn = GTSCardAPI.GT_ZeroPos((short)IConfig.CardNum, (short)startAxisIndex, (short)count);
return rtn == (short)GTSRetCode.GRCRunOK;
@@ -1130,7 +1168,6 @@
return axisMovingStatusesList;
}
-
public List<IOItem> GetMonitorValues()
{
@@ -1164,6 +1201,79 @@
return result;
}
+ SpinWait _positionWait = new SpinWait();
+ private async void MonitorPosition()
+ {
+ await Task.Run(() =>
+ {
+ while (CurrentState != EnumHelper.DeviceState.DSClose && CurrentState != EnumHelper.DeviceState.DSExcept && CurrentState != EnumHelper.DeviceState.DSUninit)
+ {
+ try
+ {
+ if (!IConfig.IsEnableMonitor)
+ return;
+
+ AxisStatusList.ForEach(a =>
+ {
+ int curPosition = (int)GetPrfPosition(a.AxisIndex);
+
+ if (a.CurPosition != curPosition)
+ {
+ a.CurPosition = curPosition;
+ AxisPositionChanged(a.AxisIndex, curPosition);
+ }
+ });
+
+ _positionWait.SpinOnce();
+ }
+ catch (Exception ex)
+ {
+ if (CurrentState == DeviceState.DSOpen)
+ {
+ LogAsync(DateTime.Now, $"{this.Name}鐩戝惉杞翠俊鎭紓甯�", ex.GetExceptionMessage());
+ }
+ }
+ }
+ });
+ }
+
+ SpinWait _statusWait = new SpinWait();
+ private async void MonitorAxisStatus()
+ {
+ await Task.Run(() =>
+ {
+ while (CurrentState != EnumHelper.DeviceState.DSClose && CurrentState != EnumHelper.DeviceState.DSExcept && CurrentState != EnumHelper.DeviceState.DSUninit)
+ {
+ try
+ {
+ if (!IConfig.IsEnableMonitor)
+ return;
+
+ AxisStatusList.ForEach(a =>
+ {
+ int curStatus = GetAxisStatus(a.AxisIndex);
+
+ if (a.AxisStatus != curStatus)
+ {
+ int temp = a.AxisStatus;
+ a.AxisStatus = curStatus;
+ AxisStatusChanged(a.AxisIndex, temp, curStatus);
+ }
+ });
+
+ _statusWait.SpinOnce();
+ }
+ catch (Exception ex)
+ {
+ if (CurrentState == DeviceState.DSOpen)
+ {
+ LogAsync(DateTime.Now, $"{this.Name}鐩戝惉杞翠俊鎭紓甯�", ex.GetExceptionMessage());
+ }
+ }
+ }
+ });
+ }
+
public async override void Monitor()
{
await Task.Run(() =>
@@ -1176,9 +1286,9 @@
return;
var newValues = GetMonitorValues();
- var newAxisMovingStatus = GetAxisMovingStatus();
+ //var newAxisMovingStatus = GetAxisMovingStatus();
- if (newValues == null || newValues.Count == 0 || newAxisMovingStatus == null || newAxisMovingStatus.Count == 0)
+ if (newValues == null || newValues.Count == 0)
continue;
//Stopwatch sw = new Stopwatch();
@@ -1192,14 +1302,14 @@
MonitorCheckAndInvoke(tempNew, tempOld);
}
- if (AxisStatusList.Count == newAxisMovingStatus.Count)
- {
- var tempNew = new List<AxisMovingStatus>(newAxisMovingStatus);//clone
- var tempOld = new List<AxisMovingStatus>(AxisStatusList);
- AxisStatusCheck(tempNew, tempOld);
- }
+ //if (AxisStatusList.Count == newAxisMovingStatus.Count)
+ //{
+ // var tempNew = new List<AxisMovingStatus>(newAxisMovingStatus);//clone
+ // var tempOld = new List<AxisMovingStatus>(AxisStatusList);
+ // AxisStatusCheck(tempNew, tempOld);
+ //}
- AxisStatusList = new List<AxisMovingStatus>(newAxisMovingStatus);
+ //AxisStatusList = new List<AxisMovingStatus>(newAxisMovingStatus);
MonitorValues = new List<IOItem>(newValues);
//sw.Stop();
--
Gitblit v1.8.0