From 6a3f006eda4f2e471870fa9ec8cacc9b785cd36a Mon Sep 17 00:00:00 2001
From: zhangzhuo <zhangzhuo@iris-rs.cn>
Date: Tue, 8 Mar 2022 16:16:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=9C=A8=E9=87=87=E9=9B=86=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E5=92=8C=E5=81=9C=E6=AD=A2=E5=89=8D=E5=90=8E=E5=88=86=E5=88=AB?=
 =?UTF-8?q?=E5=B0=86=E4=BF=9D=E6=8C=81=E7=94=B5=E6=B5=81=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=BA0.4=E5=92=8C0.=202.=E5=9C=A8=E6=96=AD=E7=94=B5?=
 =?UTF-8?q?=E5=90=8E=E5=B0=86=E4=BF=9D=E6=8C=81=E7=94=B5=E6=B5=81=E8=AE=BE?=
 =?UTF-8?q?=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/CaptureThread/MainDataGrabber.cpp | 31 ++++++++++++++++++++++--
 source/CaptureThread/MainDataGrabber.h   |  1 +
 source/CaptureThread/Scheduler.cpp       |  3 ++-
 source/CaptureThread/Scheduler.h         |  1 +
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/source/CaptureThread/MainDataGrabber.cpp b/source/CaptureThread/MainDataGrabber.cpp
index 92ac2cd..8b3f7a9 100644
--- a/source/CaptureThread/MainDataGrabber.cpp
+++ b/source/CaptureThread/MainDataGrabber.cpp
@@ -252,6 +252,7 @@ int CMainDataGrabber::SetupMsgPipelines()
 
 	connect(this, &CMainDataGrabber::SignalGrabOnceFinished, this, &CMainDataGrabber::GrabOnceFinished);
 	connect(m_psScheduler, &Scheduler::SignalGrabOnce, this, &CMainDataGrabber::OnTimeCounter);
+	connect(m_psScheduler, &Scheduler::SignalZeroHoldCurrent, this, &CMainDataGrabber::OnZeroHoldCurrent);
 	connect(this, &CMainDataGrabber::SignalStartGrab, this, &CMainDataGrabber::StartGrabTimer);
 	connect(this, &CMainDataGrabber::SignalGrabOnceFinished_Signal, this, &CMainDataGrabber::GrabOnceFinished_Signal);
 	connect(this, &CMainDataGrabber::SignalGrabOnceFinished_Dark, this, &CMainDataGrabber::GrabOnceFinished_Dark);
@@ -443,6 +444,15 @@ int CMainDataGrabber::GrabOnceFinished()
 		 m_pControlThread[i]->ClearBuffer();
 	 }
 
+
+	 ////hold current
+	 bool bRes = m_ctrlLS.SetHoldCurrent(0.4f);
+	 if (!bRes)
+	 {
+		qDebug() << "SetHoldCurrent 0.4 Failed";
+	 }
+	 Delay_MSec(1000);
+	 ////
 	 for (int i=0;i< m_struAcqPosSetting.iTotalPosition-1;i++)
 	 {
 		 ResetThreadStatus();
@@ -479,9 +489,15 @@ int CMainDataGrabber::GrabOnceFinished()
 		 {
 			 Delay_MSec(1000);
 		 }
-
 	 }
-
+	 ////hold current
+	 bRes = m_ctrlLS.SetHoldCurrent(0);
+	 if (!bRes)
+	 {
+		qDebug() << "SetHoldCurrent 0 Failed";
+	 }
+     Delay_MSec(1000);
+	 ////
 	 std::vector<std::vector<DataFrame>> vecData;
 	
 	 for (ZZ_U8 i = 0; i < m_struDeviceContext.ucDeviceNumber; i++)
@@ -544,3 +560,14 @@ int CMainDataGrabber::GrabOnceFinished()
  	return 0;
  }
 
+ int CMainDataGrabber::OnZeroHoldCurrent()
+ {
+	bool bRes = m_ctrlLS.SetHoldCurrent(0);
+	if (!bRes)
+	{
+		qDebug() << "OnZeroHoldCurrent Failed";
+	}
+
+	 return 0;
+ }
+
diff --git a/source/CaptureThread/MainDataGrabber.h b/source/CaptureThread/MainDataGrabber.h
index a440052..0fd2df4 100644
--- a/source/CaptureThread/MainDataGrabber.h
+++ b/source/CaptureThread/MainDataGrabber.h
@@ -75,6 +75,7 @@ public slots:
 	int InitLS();
 	int StartGrabTimer();
 	int OnTimeCounter();
+	int OnZeroHoldCurrent();
 
 	int HandleThreadEvent_Signal(int iThreadID, int iFlagStatus);
 	int HandleThreadEvent_Dark(int iThreadID, int iFlagStatus);
diff --git a/source/CaptureThread/Scheduler.cpp b/source/CaptureThread/Scheduler.cpp
index b455a8d..986ad29 100644
--- a/source/CaptureThread/Scheduler.cpp
+++ b/source/CaptureThread/Scheduler.cpp
@@ -79,7 +79,8 @@ int Scheduler::OnTimeCounter()
 		{
 			m_iFlagIsOnRestart = 1;
 		}
-		system("gpio write 1 0");//�豸�ϵ�
+		emit SignalZeroHoldCurrent();
+		system("gpio write 1 0");//É豸¶Ïµç
 		qDebug() << "gpio write 1 0......"<<endl;
 		qDebug() << "Non working time. Idling......";
 		return 0;
diff --git a/source/CaptureThread/Scheduler.h b/source/CaptureThread/Scheduler.h
index 213240a..ae454b5 100644
--- a/source/CaptureThread/Scheduler.h
+++ b/source/CaptureThread/Scheduler.h
@@ -22,6 +22,7 @@ public:
 public slots:
 	int OnTimeCounter();
 signals:
+	void SignalZeroHoldCurrent();
 	void SignalGrabOnce();
 	void SignalSelfStart();
 };
\ No newline at end of file