From f94173dba35bcde09a5a792f50496cf208406c47 Mon Sep 17 00:00:00 2001
From: zhangzhuo <zhangzhuo@iris-rs.cn>
Date: Tue, 1 Mar 2022 09:53:11 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B1=8F=E8=94=BD=E4=BA=86IS1=E7=9A=84?=
 =?UTF-8?q?=E6=B8=A9=E5=BA=A6=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/CaptureThread/AbstractFSController.cpp | 34 +++++++++++++------
 source/FS/ATPControl_Serial_QT.cpp            |  4 +--
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/source/CaptureThread/AbstractFSController.cpp b/source/CaptureThread/AbstractFSController.cpp
index a16978e..84e9ba8 100644
--- a/source/CaptureThread/AbstractFSController.cpp
+++ b/source/CaptureThread/AbstractFSController.cpp
@@ -260,17 +260,16 @@ int CAbstractFSController::PerformAutoExposure()
 			//}
 			break;
 		}
-
-		iRes = m_pFSCtrl->SetExposureTime((int)iExposureTime);
-		if (iRes != 0)
-		{
-			qDebug() << "Err:PerformAutoExposure Failed.Exit Code:4" << " Thread ID:" << m_iThreadID;
-			return 3;
-		}
-		else
-		{
-			qDebug() << "Success:PerformAutoExposure. Value" << iExposureTime << " Thread ID:" << m_iThreadID;
-		}
+	}
+	iRes = m_pFSCtrl->SetExposureTime((int)iExposureTime);
+	if (iRes != 0)
+	{
+		qDebug() << "Err:PerformAutoExposure Failed.Exit Code:4" << " Thread ID:" << m_iThreadID;
+		return 3;
+	}
+	else
+	{
+		qDebug() << "Success:PerformAutoExposure. Value" << iExposureTime << " Thread ID:" << m_iThreadID;
 	}
 	fPredictedExposureTime = iExposureTime;
 	qDebug() << "--------------------------Stop PerformAutoExposure" << " Thread ID:" << m_iThreadID;
@@ -304,11 +303,24 @@ int CAbstractFSController::TakeSignalFrame()
 
 DataFrame CAbstractFSController::TakeOneFrame()
 {
+	using namespace ZZ_MISCDEF::IRIS;
 	//int iExpTime = 0;
 	DataFrame dfTemp;
 // 	m_pFSCtrl->GetExposureTime(iExpTime);
 // 	dfTemp.usExposureTimeInMS = iExpTime;
 // 	m_pFSCtrl->GetDeviceTemperature(dfTemp.fTemperature);
+
+	if (m_fsInfo.ucDeviceModel== DeviceModel::ISIF)
+	{
+		float fTemp;
+		m_pFSCtrl->GetDeviceTemperature(fTemp);
+		dfTemp.fTemperature = fTemp;
+	}
+	else if(m_fsInfo.ucDeviceModel == DeviceModel::IS1)
+	{
+		dfTemp.fTemperature = 0;
+	}
+
 	int iRes = m_pFSCtrl->SingleShot(dfTemp);
 	if (iRes != 0)
 	{
diff --git a/source/FS/ATPControl_Serial_QT.cpp b/source/FS/ATPControl_Serial_QT.cpp
index b75ff5b..f2127c5 100644
--- a/source/FS/ATPControl_Serial_QT.cpp
+++ b/source/FS/ATPControl_Serial_QT.cpp
@@ -731,11 +731,9 @@ int ZZ_ATPControl_Serial_Qt::SingleShot(DataFrame &dfData)
 // 			dfData.lData[i] = usData[i];
 // 		}
 	}
-	float fTemp;
-	GetDeviceTemperature(fTemp);
 
 	dfData.usExposureTimeInMS = m_iExposureTime;
-	dfData.fTemperature = fTemp;
+	
 	
 
 	return 0;