From b5e7fa2db4ac36fdb7bf9fd330d12a72ade9d483 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期日, 24 一月 2021 15:07:26 +0800
Subject: [PATCH] 0124
---
src/Bro.Device.Gocator/GocatorDriver.cs | 132 ++++++++++++++++++++++++++++++++++---------
1 files changed, 104 insertions(+), 28 deletions(-)
diff --git a/src/Bro.Device.Gocator/GocatorDriver.cs b/src/Bro.Device.Gocator/GocatorDriver.cs
index a45de96..fb7e04f 100644
--- a/src/Bro.Device.Gocator/GocatorDriver.cs
+++ b/src/Bro.Device.Gocator/GocatorDriver.cs
@@ -139,10 +139,12 @@
//imgSet.HImage.GenImage1("int4", (int)width, zoomHeight, zoomPtr);
imgSet.HImage.GenImage1(IIConfig.ByteNums == GocatorDataByteNums.Byte2 ? "uint2" : "int4", (int)width, zoomHeight, zoomPtr);
- imgSet.HImage_2 = imgSet.HImage.Clone();
+ //imgSet.HImage_2 = imgSet.HImage.Clone();
//imgSet.HImage_2.GenImage1("uint2", (int)width, zoomHeight, zoomPtr);
//imgSet.HImage_2.GenImage1("int4", (int)width, zoomHeight, zoomPtr);
- //imgSet.HImage_2.GenImage1(IIConfig.ByteNums == GocatorDataByteNums.Byte2 ? "uint2" : "int4", (int)width, zoomHeight, zoomPtr);
+
+ imgSet.HImage_2 = new HImage();
+ imgSet.HImage_2.GenImage1(IIConfig.ByteNums == GocatorDataByteNums.Byte2 ? "uint2" : "int4", (int)width, zoomHeight, zoomPtr);
LaserScanParam para = new LaserScanParam()
{
@@ -218,23 +220,42 @@
public override IImageSet Snapshot(IOperationConfig config)
{
+ GocatorOperationConfig opConfig = config as GocatorOperationConfig;
if (!IIConfig.IsAsyncMode)
{
- if (config is GocatorOperationConfig opConfig)
+ if (opConfig.IsOpenConnection)
{
- if (opConfig.IsOpenConnection)
+ while (sensor.State != GoState.Ready)
{
- system.Start();
- }
- else
- {
- system.Stop();
+ Thread.Sleep(10);
}
- if (!opConfig.IsSnapshotAction)
+ do
{
- return null;
- }
+ try
+ {
+ system.Start();
+ if (sensor.State != GoState.Running)
+ {
+ Thread.Sleep(100);
+ }
+ else
+ {
+ break;
+ }
+ }
+ catch (Exception ex)
+ {
+ LogAsync(DateTime.Now, $"寮�鍚紓甯革細{ex.GetExceptionMessage()}", "");
+ }
+ } while (true);
+
+ LogAsync(DateTime.Now, $"浼犳劅鍣ㄥ惎鍔ㄦ垚鍔�", "");
+ }
+
+ if (!opConfig.IsSnapshotAction)
+ {
+ return null;
}
}
@@ -258,6 +279,11 @@
}
else
{
+ if (!opConfig.IsSnapshotAction)
+ {
+ return null;
+ }
+
try
{
dataSet = system.ReceiveData(IIConfig.SnapshotTimeout);
@@ -265,17 +291,57 @@
catch (Exception ex)
{
LogAsync(DateTime.Now, $"{Name}鑾峰彇鍥惧儚寮傚父", ex.GetExceptionMessage());
- return null;
+ imgSet.HImage = null;
+ dataSet = null;
+ //return imgSet;
}
}
- HandleGoData(dataSet, imgSet);
-
- dataSet.Dispose();
-
- if (imgSet.HImage == null)
+ if (!IIConfig.IsAsyncMode)
{
- LogAsync(DateTime.Now, $"{Name}鏈兘鑾峰彇HImage鍥惧儚", "");
+ if (!opConfig.IsOpenConnection)
+ {
+ while (sensor.State == GoState.Busy)
+ {
+ Thread.Sleep(100);
+ }
+
+ do
+ {
+ try
+ {
+ system.Stop();
+
+ if (sensor.State != GoState.Ready)
+ {
+ Thread.Sleep(100);
+ }
+ else
+ {
+ break;
+ }
+ }
+ catch (Exception ex)
+ {
+ LogAsync(DateTime.Now, $"鍏抽棴寮傚父锛歿ex.GetExceptionMessage()}", "");
+ }
+ } while (true);
+
+ sensor.Flush();
+ LogAsync(DateTime.Now, $"浼犳劅鍣ㄥ叧闂垚鍔�", "");
+ }
+ }
+
+ if (dataSet != null)
+ {
+ HandleGoData(dataSet, imgSet);
+
+ dataSet.Dispose();
+
+ if (imgSet.HImage == null)
+ {
+ LogAsync(DateTime.Now, $"{Name}鏈兘鑾峰彇HImage鍥惧儚", "");
+ }
}
return imgSet;
@@ -375,6 +441,8 @@
protected override void Start()
{
base.Start();
+
+ //system.Start();
if (IIConfig.IsAsyncMode)
system.Start();
@@ -535,21 +603,29 @@
});
}
- public override void ClearImageSet(IImageSet set)
- {
- if (set.IsOriginSaved && set.IsFitSaved && set.IsAddtionalSaved)
- {
- (set as GoImageSet).HImage_2?.Dispose();
- (set as GoImageSet).HImage_2 = null;
- }
+ //public override void ClearImageSet(IImageSet set)
+ //{
+ // if (set.IsOriginSaved && set.IsFitSaved && set.IsAddtionalSaved)
+ // {
+ // (set as GoImageSet).HImage_2?.Dispose();
+ // (set as GoImageSet).HImage_2 = null;
+ // }
- base.ClearImageSet(set);
- }
+ // base.ClearImageSet(set);
+ //}
#endregion
}
public class GoImageSet : ImageSet
{
public HImage HImage_2 { get; set; }
+
+ public override void Dispose()
+ {
+ base.Dispose();
+
+ HImage_2?.Dispose();
+ HImage_2 = null;
+ }
}
}
--
Gitblit v1.8.0