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 | 82 +++++++++++++++++++++++++++++++++++-----
1 files changed, 71 insertions(+), 11 deletions(-)
diff --git a/src/Bro.Device.Gocator/GocatorDriver.cs b/src/Bro.Device.Gocator/GocatorDriver.cs
index ba3546f..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()
{
@@ -223,7 +225,32 @@
{
if (opConfig.IsOpenConnection)
{
- system.Start();
+ while (sensor.State != GoState.Ready)
+ {
+ Thread.Sleep(10);
+ }
+
+ do
+ {
+ 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)
@@ -264,7 +291,9 @@
catch (Exception ex)
{
LogAsync(DateTime.Now, $"{Name}鑾峰彇鍥惧儚寮傚父", ex.GetExceptionMessage());
- return null;
+ imgSet.HImage = null;
+ dataSet = null;
+ //return imgSet;
}
}
@@ -272,18 +301,47 @@
{
if (!opConfig.IsOpenConnection)
{
- system.Stop();
+ 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, $"浼犳劅鍣ㄥ叧闂垚鍔�", "");
}
}
- HandleGoData(dataSet, imgSet);
-
- dataSet.Dispose();
-
- if (imgSet.HImage == null)
+ if (dataSet != null)
{
- LogAsync(DateTime.Now, $"{Name}鏈兘鑾峰彇HImage鍥惧儚", "");
+ HandleGoData(dataSet, imgSet);
+
+ dataSet.Dispose();
+
+ if (imgSet.HImage == null)
+ {
+ LogAsync(DateTime.Now, $"{Name}鏈兘鑾峰彇HImage鍥惧儚", "");
+ }
}
return imgSet;
@@ -384,6 +442,8 @@
{
base.Start();
+ //system.Start();
+
if (IIConfig.IsAsyncMode)
system.Start();
}
--
Gitblit v1.8.0