From 984716c1c92bab345a7744806c39658db43d84ea Mon Sep 17 00:00:00 2001
From: wells <123>
Date: 星期六, 11 七月 2020 10:19:41 +0800
Subject: [PATCH] 板卡开启时监听
---
src/Bro.Device.GTSCard/GTSCardDriver.cs | 10 ++++++----
src/Bro.Common.Device/DeviceBase/MotionCardBase.cs | 9 ++++++++-
src/Bro.M071.Process/M071Process.cs | 2 +-
src/Bro.Process/ProcessControl.cs | 8 ++++----
src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.cs | 2 +-
5 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
index 4e539a0..103cc21 100644
--- a/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
+++ b/src/Bro.Common.Device/DeviceBase/MotionCardBase.cs
@@ -33,6 +33,13 @@
OnAxisStatusChanged?.Invoke(axisIndex, preStatus, curStatus);
}
+ protected override void Start()
+ {
+ Task.Run(() =>
+ {
+ Monitor();
+ });
+ }
public abstract List<AxisInfo> GetCurrentAxisInfo(params string[] axisName);
public abstract void Monitor();
public abstract ResponseMessage MoveToPoint(IOperationConfig opConfig);
@@ -133,7 +140,7 @@
[Category("鏉垮崱閰嶇疆")]
[DisplayName("鍗″彿")]
[Description("CardNum锛氬崱鍙�")]
- public int CardNum { get; set; }
+ public int CardNum { get; set; } = 1;
[Category("鏉垮崱閰嶇疆")]
[DisplayName("鍒濆閰嶇疆鏂囦欢璺緞")]
diff --git a/src/Bro.Device.GTSCard/GTSCardDriver.cs b/src/Bro.Device.GTSCard/GTSCardDriver.cs
index 5d5bf1c..c2a339b 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);
diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index c3c2e4f..caa2bd1 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/src/Bro.M071.Process/M071Process.cs
@@ -79,7 +79,7 @@
private void InitialSetting()
{
//鏁版嵁搴撹縼绉绘鏌�
- DatabaseInitialize.Initialize();
+ //DatabaseInitialize.Initialize();
MotionCardSettingCheck();
diff --git a/src/Bro.Process/ProcessControl.cs b/src/Bro.Process/ProcessControl.cs
index afbc38d..ca587d2 100644
--- a/src/Bro.Process/ProcessControl.cs
+++ b/src/Bro.Process/ProcessControl.cs
@@ -21,7 +21,7 @@
using System.Threading.Tasks;
using static Bro.Common.Helper.EnumHelper;
-namespace Bro.Process
+namespace Bro.Process
{
[Process("", DeviceAttributeType.Device)]
public partial class ProcessControl : IProcess
@@ -527,7 +527,7 @@
object res = null;
int reTryTimes = config.ReTryTimes;
IDevice device = DeviceCollection.FirstOrDefault(u => u.Id == deviceId);
- LogAsync(DateTime.Now, $"{device.Name}璋冪敤{methodCode}寮�濮�", "");
+ LogAsync(DateTime.Now, $"{device?.Name}璋冪敤{methodCode}寮�濮�", "");
Stopwatch sw = new Stopwatch();
sw.Start();
@@ -603,8 +603,8 @@
#endregion
sw.Stop();
- LogAsync(DateTime.Now, $"{device.Name}璋冪敤{methodCode}瀹屾垚锛岃�楁椂{sw.ElapsedMilliseconds}ms", "");
- TimeRecordCSV(DateTime.Now, device.Name, $"{methodCode}璋冪敤瀹屾垚", (int)sw.ElapsedMilliseconds);
+ LogAsync(DateTime.Now, $"{device?.Name}璋冪敤{methodCode}瀹屾垚锛岃�楁椂{sw.ElapsedMilliseconds}ms", "");
+ TimeRecordCSV(DateTime.Now, device?.Name, $"{methodCode}璋冪敤瀹屾垚", (int)sw.ElapsedMilliseconds);
}
/// <summary>
diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.cs
index 3ac3207..5b4584d 100644
--- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.cs
+++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardIOStatus.cs
@@ -53,7 +53,7 @@
private void IoOut_DoubleClick(string desc, bool isOn)
{
var index = Convert.ToInt16(desc.Substring(3));
- MotionCard.WriteOutput(index, isOn ? IOValue.FALSE : IOValue.TRUE);
+ MotionCard.WriteOutput(index, isOn ? IOValue.TRUE : IOValue.FALSE);
}
private void RefreshIOStatus(object sender, EventArgs e)
--
Gitblit v1.8.0