xin/TowerOptoSifAndSpectral
1
0
Fork 0
mirror of http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git synced 2025-10-18 19:39:43 +08:00
Code Issues Projects Releases Wiki Activity

测试前

Browse Source
This commit is contained in:
zhangzhuo
2021-12-16 15:50:17 +08:00
parent af00b1c47e
commit 2ab5c91d76
14 changed files with 227 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/FS/ZZ_Types.h
View File

@ -13,7 +13,7 @@ namespace ZZ_MISCDEF
typedef unsigned char ZZ_U8;
typedef unsigned short int ZZ_U16;
typedef unsigned long int ZZ_U32;
typedef long int ZZ_S32;
typedef long int ZZ_S32;
namespace IRIS
@ -311,4 +311,12 @@ namespace ZZ_MISCDEF
}ATPDataHeader;
}
//misc detector
namespace MISC_DETECTOR
{
typedef struct tagHumitureDeviceInfo
{
QString qstrInterfaceName;
}HumitureDeviceInfo;
}
};

19
source/Misc_Detector/GY39Controller.cpp
View File

@ -121,6 +121,7 @@ int GY39Controller::GetHumiture(float &fTemp, float &fHum)
qbSend[0] = (ZZ_U8)0xA5;
qbSend[1] = (ZZ_U8)0x52;
qbSend[2] = (ZZ_U8)0xF7;
int iRes = SendCommand(qbSend);
if (iRes)
{
@ -138,3 +139,21 @@ int GY39Controller::GetHumiture(float &fTemp, float &fHum)
fHum = m_fHumidity;
return 0;
}
int GY39Controller::GetHumiture_retry(float &fTemp, float &fHum)
{
int iCount = 0;
while (iCount<3)
{
if (GetHumiture(fTemp, fHum) == 0)
{
return 0;
}
else
{
iCount++;
}
}
return 1;
}

1
source/Misc_Detector/GY39Controller.h
View File

@ -13,6 +13,7 @@ private:
public:
int Initialize(std::string ucPortName,bool bAuto15 = false,bool bAuto45 = false);
int GetHumiture(float &fTemp, float &fHum);
int GetHumiture_retry(float &fTemp, float &fHum);
public slots:
signals:

33
source/Settings/SystemConfigger.cpp
View File

@ -78,6 +78,9 @@
m_struLSContext.ucCmdID = m_qsDeviceConfig->value(QString("LINEAR SHUTTER/DCID")).toInt();
m_struLSContext.ucProtocolType = m_qsDeviceConfig->value(QString("LINEAR SHUTTER/Type")).toInt();
m_struLSContext.strInterface = m_qsDeviceConfig->value(QString("LINEAR SHUTTER/Port")).toString().toStdString();
//////////////////////////////////////////////////////////////////////////humiture
m_struHumitureDeviceInfo.qstrInterfaceName = m_qsDeviceConfig->value(QString("HUMITURE/Port")).toString();
//////////////////////////////////////////////////////////////////////////load json settings
qfJConfig.setFileName(m_qstrJSONConfigFilePath);
bool bRes = qfJConfig.open(QIODevice::ReadOnly);
@ -95,6 +98,21 @@
return 2;
}
m_qjoJObj = m_qjdJDoc.object();
int iRes = LoadSettingsFromFile_System();
if (iRes)
{
qDebug() << " SysConfigger Initialize Err...LoadSettingsFromFile_System";
return iRes;
}
iRes = LoadSettingsFromFile_MISC();
if (iRes)
{
qDebug() << " SysConfigger Initialize Err...LoadSettingsFromFile_MISC";
return iRes;
}
return 0;
}
@ -119,6 +137,21 @@
return 0;
}
int ZZ_SysConfigger::GetMiscParams(HumitureDeviceInfo &struHDI)
{
struHDI = m_struHumitureDeviceInfo;
return 0;
}
int ZZ_SysConfigger::GetParams(RunTimeGrabberParams &struGrabberRTParams, EContext &struEC, MEContext &struMEC, HumitureDeviceInfo &struHDI)
{
GetGrabberRunParams(struGrabberRTParams);
GetECParams(struEC);
GetMECParams(struMEC);
GetMiscParams(struHDI);
return 0;
}
int ZZ_SysConfigger::LoadSettingsFromFile_IS1()
{
m_struIS1Info.qstrCalFile_U0 = m_qjoJObj.value("IS1UpCalFile").toString();

5
source/Settings/SystemConfigger.h
View File

@ -3,7 +3,7 @@
#include "ZZ_Types.h"
using namespace ZZ_MISCDEF::ZZ_RUNPARAMS;
using namespace ZZ_MISCDEF::ZZ_DATAFILE;
using namespace ZZ_MISCDEF::MISC_DETECTOR;
class ZZ_SysConfigger :public QObject
{
Q_OBJECT
@ -16,6 +16,8 @@ public:
int GetGrabberRunParams(RunTimeGrabberParams &struGrabberRTParams);
int GetECParams(EContext &struEC);
int GetMECParams(MEContext &struMEC);
int GetMiscParams(HumitureDeviceInfo &struHDI);
int GetParams(RunTimeGrabberParams &struGrabberRTParams, EContext &struEC, MEContext &struMEC, HumitureDeviceInfo &struHDI);
int LoadSettingsFromFile_IS1();
int LoadSettingsFromFile_iSIF();
@ -38,6 +40,7 @@ public:
LSContext m_struLSContext;
FSContext m_struFSContext;
AcqPosSettings m_struAcqPosition;
HumitureDeviceInfo m_struHumitureDeviceInfo;
//////////////////////////////////////////////////////////////////////////
EContext m_struEC;
MEContext m_struMEC;

4
source/Thread/MainDataGrabber.cpp
View File

@ -381,7 +381,7 @@ int CMainDataGrabber::GrabOnceFinished()
for (int i=0;i< m_struAcqPosSetting.iTotalPosition-1;i++)
{
////move to
m_ctrlLS.ILMES_MoveToPos(i+1);
// m_ctrlLS.ILMES_MoveToPos(i+1);
m_struAcqPosSetting.iPosition[i + 1];
m_iFlagIsCapturing_Signal = 1;
emit SignalStartGrabOnce_Signal();
@ -392,7 +392,7 @@ int CMainDataGrabber::GrabOnceFinished()
////move to
m_ctrlLS.ILMES_MoveToPos(0);
// m_ctrlLS.ILMES_MoveToPos(0);
m_struAcqPosSetting.iPosition[0];
m_iFlagIsCapturing_Dark = 1;
emit SignalStartGrabOnce_Dark();

11
source/Thread/Scheduler.cpp
View File

@ -50,14 +50,21 @@ void Scheduler::StartAsPlanned()
}
}
int iIntervalInMS = m_struAcqTime.qtInterval.hour() * 3600 * 1000 + m_struAcqTime.qtInterval.minute() * 60 * 1000 + m_struAcqTime.qtInterval.second() * 1000;
int iIntervalInMS = m_struAcqTime.qtInterval.hour() * 3600 * 1000 + m_struAcqTime.qtInterval.minute() * 60 * 1000 + m_struAcqTime.qtInterval.second() * 1000;
m_GrabTimer->start(iIntervalInMS);
}
int Scheduler::OnTimeCounter()
{
QTime qtTime = QTime::currentTime();
if (m_struAcqTime.qtStartTime <= qtTime && qtTime < m_struAcqTime.qtStopTime)
{
return 1;
qDebug() << "Non working time. Idling......";
}
emit SignalGrabOnce();
return 0;
}