添加了 温湿度传感器控制代码 已能读取 等待拷机测试

CmakeLists.txt

@@ -20,6 +20,7 @@ include_directories("source/Settings")
 include_directories("source/Thread")
 include_directories("source/LinearShutter")
 include_directories("source/OSIF/include")
+include_directories("source/Misc_Detector")
 
 link_directories("source/OSIF/DLib")
 

config/DeviceSettings.ini

@@ -4,14 +4,14 @@ TotalSpectrometer=1
 [FS1]
 Model=OSIFAlpha
 Port=-1
-UID=QEP02975
+UID=FLMS15814
 AEMax=0.85
 AEMin=0.75
 Depth=230000
 [FS2]
 Model=OSIFBeta
 Port=-1
-UID=FLMS15815
+UID=QEP02975
 AEMax=0.85
 AEMin=0.75
 Depth=65535
@@ -28,4 +28,5 @@ Position2=220000
 Position3=330000
 Position4=440000
 Position5=550000
-
+[HUMITURE]
+port=COM11

config/config.json

@@ -1 +1 @@
-{"BeginTime":"16:43","IntervalTime":"10","EndTime":"16:45","Location":"beijing","GPS_Longtitude":"117","GPS_Latitude":"118","GPS_Altitude":"50","GPS_North":"on","InstallationTime":"2021-11-18","ISIFCalibrationTime":"2021-11-26","IS1CalibrationTime":"2021-11-19","NameOfMaintenanceStaff":"renlixin","PhoneNumberOfMaintenanceStaff":"110110110","DownloadUserID":"newuser","DownlaodAddress":"http:\/\/www.iris-rs.cn","SIFUpCalFile":"dat1","SIFDownCalFile1":"dat2","SIFDownCalFile2":"dat2","SIFDownCalFile3":"dat3","IS1UpCalFile":"dat1","IS1DownCalFile1":"sdaf","IS1DownCalFile2":"dat2","IS1DownCalFile3":"asdf","HTTPServer":"192.168.2.1"}
+{"BeginTime":"8:00","IntervalTime":"10","EndTime":"18:00","Location":"beijing","GPS_Longtitude":"117","GPS_Latitude":"118","GPS_Altitude":"50","GPS_North":"on","InstallationTime":"2021-11-18","ISIFCalibrationTime":"2021-11-26","IS1CalibrationTime":"2021-11-19","NameOfMaintenanceStaff":"renlixin","PhoneNumberOfMaintenanceStaff":"110110110","DownloadUserID":"newuser","DownlaodAddress":"http:\/\/www.iris-rs.cn","SIFUpCalFile":"dat1","SIFDownCalFile1":"dat2","SIFDownCalFile2":"dat2","SIFDownCalFile3":"dat3","IS1UpCalFile":"dat1","IS1DownCalFile1":"sdaf","IS1DownCalFile2":"dat2","IS1DownCalFile3":"asdf","HTTPServer":"192.168.2.1"}

main.cpp

@@ -5,6 +5,7 @@
 #include "MainDataGrabber.h"
 #include "DataFileProcessor.h"
 #include "Scheduler.h"
+#include "GY39Controller.h"
 using namespace std;
 #pragma once
 
@@ -14,7 +15,10 @@ int main(int argc, char *argv[])
 	QCoreApplication a(argc, argv);
 	//////////////////////////////////////////////////////////////////////////logger
 	//QT_LOG::ZZ_InitLogger(QCoreApplication::applicationDirPath() + "/Log/");
-	
+	float fTemp, fHum;
+	GY39Controller m_test123;
+	m_test123.Initialize("COM11");
+	m_test123.GetHumiture(fTemp, fHum);
 
 	//////////////////////////////////////////////////////////////////////////configger
 	DataFileProcessor testdp;

source/Misc_Detector/GY39Controller.cpp

@@ -0,0 +1,140 @@
+#include "GY39Controller.h"
+#include "ZZ_Types.h"
+using namespace ZZ_MISCDEF;
+
+GY39Controller::GY39Controller(QObject* parent /*= nullptr*/)
+{
+	m_pSerialPort = new QSerialPort;
+	m_iBaudRate = 9600;
+}
+
+GY39Controller::~GY39Controller()
+{
+	if (m_pSerialPort != NULL)
+	{
+		delete m_pSerialPort;
+	}
+}
+
+int GY39Controller::SendCommand(QByteArray qbCommand)
+{
+	qint64 qi64Write = m_pSerialPort->write(qbCommand);
+	if (qi64Write != qbCommand.size())
+	{
+		qDebug() << "Err:write Failed.Exit Code:1" << qi64Write;
+		return 1;
+	}
+
+	return 0;
+}
+
+int GY39Controller::RecvHumitureData(QByteArray &qbData)
+{
+	qbData.clear();
+	qbData = m_pSerialPort->readAll();
+
+	int iCounter = 0;
+	while (qbData.size() < 15)
+	{
+		m_pSerialPort->waitForReadyRead(50);
+		QByteArray qbTemp = m_pSerialPort->readAll();
+		qbData.append(qbTemp);
+
+		if (iCounter > 10)
+		{
+			qDebug() << "Err:RecvHumitureData Failed,Not Enough Data.Exit Code:1" << qbData.size();
+			return 1;
+		}
+		iCounter++;
+	}
+	return 0;
+}
+
+int GY39Controller::ParseHumitureData(QByteArray &qbData)
+{
+	ZZ_U8 cTempH8, cTempL8, cHumH8, cHumL8;
+
+	cTempH8 = qbData[4];
+	cTempL8 = qbData[5];
+
+	cHumH8 = qbData[10];
+	cHumL8 = qbData[11];
+
+	float fTemp = (cTempH8 << 8) | cTempL8;
+	fTemp = fTemp / 100;
+	float fHum = (cHumH8 << 8) | cHumL8;
+	fHum = fHum / 100;
+
+	m_fTemperature = fTemp;
+	m_fHumidity = fHum;
+	return 0;
+}
+
+int GY39Controller::Initialize(std::string ucPortName, bool bAuto15/*=false*/, bool bAuto45/*=false*/)
+{
+	QString qstrPortName = QString::fromStdString(ucPortName);
+
+	m_pSerialPort->setPortName(qstrPortName);
+	m_pSerialPort->setReadBufferSize(512);
+	bool bRes = m_pSerialPort->setBaudRate(m_iBaudRate);
+	if (!bRes)
+	{
+		qDebug() << "Err:setBaudRate Failed.Exit Code:1";
+		//std::cout << "Err.setBaudRate Failed" << std::endl;
+		return 1;
+	}
+
+	bRes = m_pSerialPort->open(QIODevice::ReadWrite);
+	if (!bRes)
+	{
+		qDebug() << "Err:open Failed.Exit Code:2";
+		//std::cout << "Err.open Failed" << std::endl;
+		return 2;
+	}
+
+	QByteArray qbSend;
+
+	if (bAuto15==false && bAuto45==false)
+	{
+		qbSend.resize(3);
+		qbSend[0] = (ZZ_U8)0xA5;
+		qbSend[1] = (ZZ_U8)0x00;
+		qbSend[2] = (ZZ_U8)0xA5;
+	}
+
+	if (bAuto15 == true && bAuto45 == true)
+	{
+		qbSend.resize(3);
+		qbSend[0] = (ZZ_U8)0xA5;
+		qbSend[1] = (ZZ_U8)0x03;
+		qbSend[2] = (ZZ_U8)0xA8;
+	}
+	SendCommand(qbSend);
+	return 0;
+}
+
+int GY39Controller::GetHumiture(float &fTemp, float &fHum)
+{
+	QByteArray qbSend,qbRecv;
+
+	qbSend.resize(3);
+	qbSend[0] = (ZZ_U8)0xA5;
+	qbSend[1] = (ZZ_U8)0x52;
+	qbSend[2] = (ZZ_U8)0xF7;
+	int iRes = SendCommand(qbSend);
+	if (iRes)
+	{
+		return iRes;
+	}
+
+	iRes = RecvHumitureData(qbRecv);
+	if (iRes)
+	{
+		return iRes;
+	}
+
+	ParseHumitureData(qbRecv);
+	fTemp = m_fTemperature;
+	fHum  = m_fHumidity;
+	return 0;
+}

source/Misc_Detector/GY39Controller.h

@@ -0,0 +1,23 @@
+#pragma once
+#include "pch.h"
+class GY39Controller :public QObject
+{
+	Q_OBJECT
+public:
+	GY39Controller(QObject* parent = nullptr);
+	~GY39Controller();
+private:
+	int SendCommand(QByteArray qbCommand);
+	int RecvHumitureData(QByteArray &qbData);
+	int ParseHumitureData(QByteArray &qbData);
+public:
+	int Initialize(std::string ucPortName,bool bAuto15 = false,bool bAuto45 = false);
+	int GetHumiture(float &fTemp, float &fHum);
+public slots:
+signals:
+
+private:
+	int m_iBaudRate;
+	QSerialPort *m_pSerialPort;
+	float m_fTemperature, m_fHumidity;
+};

source/Settings/SystemConfigger.cpp

@@ -32,6 +32,7 @@
 		delete m_qsDeviceConfig;
 	 }
 	 m_qsDeviceConfig = new QSettings(m_qstrDeviceConfigFilePath, QSettings::IniFormat);
+	 ////FS
 	 m_struFSContext.ucDeviceNumber = m_qsDeviceConfig->value(QString("DEVICE INFO/TotalSpectrometer"),-1).toInt();
 	 if (m_struFSContext.ucDeviceNumber == -1)
 	 {
@@ -59,6 +60,7 @@
 		 m_struFSContext.lDepth[i] = lDepth;
 	 }
 
+	 ////LS
 	 m_struAcqPosition.iTotalPosition = m_qsDeviceConfig->value(QString("LINEAR SHUTTER/TotalPosition"), -1).toInt();
 	 if (m_struAcqPosition.iTotalPosition == -1)
 	 {

source/Thread/Scheduler.cpp

@@ -44,7 +44,7 @@ void Scheduler::StartAsPlanned()
 	while (!bStopWait)
 	{
 		QThread::msleep(100);
-		if (m_struAcqTime.qtStartTime >= qtTime && qtTime < m_struAcqTime.qtStopTime)
+		if (m_struAcqTime.qtStartTime <= qtTime && qtTime < m_struAcqTime.qtStopTime)
 		{
 			bStopWait = true;
 		}