From 2edc3c54ba7a42d5e9bb9120b9881d418e6bd408 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期五, 13 八月 2021 09:38:29 +0800
Subject: [PATCH] 1. GTS回原点修改，避免来回 2. 添加单键测量结果补偿 3. 部分条件限制，日志修改 4. 来料检debug，添加退出条件判断
---
src/Bro.Process/ProcessControl.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/Bro.Process/ProcessControl.cs b/src/Bro.Process/ProcessControl.cs
index 2f31a10..7e900ab 100644
--- a/src/Bro.Process/ProcessControl.cs
+++ b/src/Bro.Process/ProcessControl.cs
@@ -208,10 +208,17 @@
d.OnLog -= OnDeviceLog;
d.OnLog += OnDeviceLog;
+ d.OnExceptionOccured = OnDeviceExceptionRaised;
+
d.StateChange(DeviceState.DSInit);
d.StateChange(DeviceState.DSOpen);
}
});
+ }
+
+ private void OnDeviceExceptionRaised(DateTime dt, Exception ex)
+ {
+ LogAsync(dt, "璁惧寮傚父", ex.GetExceptionMessage());
}
#endregion
@@ -725,9 +732,12 @@
OnAlarmUpdate?.BeginInvoke(alarmMsg, null, null);
}
- public virtual void RaisedAlarm(string alarmMsg)
+ public async virtual void RaisedAlarm(string alarmMsg)
{
- OnAlarmUpdate?.Invoke(alarmMsg);
+ await Task.Run(() =>
+ {
+ OnAlarmUpdate?.Invoke(alarmMsg);
+ });
}
#endregion
--
Gitblit v1.8.0