mirror of
http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git
synced 2025-10-19 03:49:42 +08:00
添加了开始计时后 立即采集的修改
This commit is contained in:
9
main.cpp
9
main.cpp
@ -7,6 +7,7 @@
|
|||||||
#include "Scheduler.h"
|
#include "Scheduler.h"
|
||||||
#include "GY39Controller.h"
|
#include "GY39Controller.h"
|
||||||
#include "MainDataUploader.h"
|
#include "MainDataUploader.h"
|
||||||
|
#include "VSMD12XMovementTest.h"
|
||||||
using namespace std;
|
using namespace std;
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
@ -18,7 +19,9 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
QCoreApplication a(argc, argv);
|
QCoreApplication a(argc, argv);
|
||||||
|
|
||||||
|
//////////////////////////////////////////////////////////////////////////for test
|
||||||
|
MovementTest m_testVSMD12X;
|
||||||
|
////////////////////////////////////////////////////////////////////////////
|
||||||
//system("gpio mode 1 output");//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ų<EFBFBD>ʼ<EFBFBD><CABC>
|
//system("gpio mode 1 output");//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ų<EFBFBD>ʼ<EFBFBD><CABC>
|
||||||
//qDebug() << "gpio mode 1 output......" << endl;
|
//qDebug() << "gpio mode 1 output......" << endl;
|
||||||
//////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////
|
||||||
@ -88,10 +91,10 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
m_mduUploader.SetContext(m_struEC, m_struMEC);
|
m_mduUploader.SetContext(m_struEC, m_struMEC);
|
||||||
//m_mduUploader.Initialize();
|
//m_mduUploader.Initialize();
|
||||||
//m_ctrlHumitureDetector.Initialize(m_struHumitureDI.qstrInterfaceName.toStdString());
|
m_ctrlHumitureDetector.Initialize(m_struHumitureDI.qstrInterfaceName.toStdString());
|
||||||
//////////////////////////////////////////////////////////////////////////prepare
|
//////////////////////////////////////////////////////////////////////////prepare
|
||||||
m_sTimer.Preheating();
|
m_sTimer.Preheating();
|
||||||
//m_ctrlHumitureDetector.GetHumiture_retry(m_fChassisTemp, m_fChassisHum);
|
m_ctrlHumitureDetector.GetHumiture_retry(m_fChassisTemp, m_fChassisHum);
|
||||||
|
|
||||||
m_struEC.qstrCaseTemperature= QString("%1").arg(m_fChassisTemp);
|
m_struEC.qstrCaseTemperature= QString("%1").arg(m_fChassisTemp);
|
||||||
m_struEC.qstrCaseHumidity = QString("%1").arg(m_fChassisHum);
|
m_struEC.qstrCaseHumidity = QString("%1").arg(m_fChassisHum);
|
||||||
|
@ -679,9 +679,11 @@ int ZZ_ATPControl_Serial_Qt::SetExposureTime(int iExposureTimeInMS)
|
|||||||
if ((ZZ_U8)qbRecv[0] != 0)
|
if ((ZZ_U8)qbRecv[0] != 0)
|
||||||
{
|
{
|
||||||
qDebug() << "Err:SetExposureTime Failed.Exit Code:1";
|
qDebug() << "Err:SetExposureTime Failed.Exit Code:1";
|
||||||
|
|
||||||
//return 1;
|
//return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -55,6 +55,10 @@ 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);
|
m_GrabTimer->start(iIntervalInMS);
|
||||||
|
|
||||||
|
QThread::msleep(5000);
|
||||||
|
qDebug() << "it's time to start work.";
|
||||||
|
emit SignalGrabOnce();
|
||||||
//this->OnTimeCounter();
|
//this->OnTimeCounter();
|
||||||
//emit &QTimer::timeout;
|
//emit &QTimer::timeout;
|
||||||
}
|
}
|
||||||
|
@ -320,6 +320,8 @@ int ZZ_ATPControl_Serial_Qt::GetExposureTime_Init()
|
|||||||
|
|
||||||
int ZZ_ATPControl_Serial_Qt::SendCommand(QByteArray qbCommand)
|
int ZZ_ATPControl_Serial_Qt::SendCommand(QByteArray qbCommand)
|
||||||
{
|
{
|
||||||
|
m_pSerialPort->clear();
|
||||||
|
|
||||||
int iSize = qbCommand.size() + 3;
|
int iSize = qbCommand.size() + 3;
|
||||||
QByteArray qbSend;
|
QByteArray qbSend;
|
||||||
qbSend.resize(4);
|
qbSend.resize(4);
|
||||||
@ -349,6 +351,7 @@ int ZZ_ATPControl_Serial_Qt::SendCommand(QByteArray qbCommand)
|
|||||||
|
|
||||||
int ZZ_ATPControl_Serial_Qt::RecvData(QByteArray &qbData)
|
int ZZ_ATPControl_Serial_Qt::RecvData(QByteArray &qbData)
|
||||||
{
|
{
|
||||||
|
|
||||||
qbData.clear();
|
qbData.clear();
|
||||||
qbData = m_pSerialPort->readAll();
|
qbData = m_pSerialPort->readAll();
|
||||||
|
|
||||||
@ -675,6 +678,8 @@ int ZZ_ATPControl_Serial_Qt::SetExposureTime(int iExposureTimeInMS)
|
|||||||
if ((ZZ_U8)qbRecv[0] != 0)
|
if ((ZZ_U8)qbRecv[0] != 0)
|
||||||
{
|
{
|
||||||
qDebug() << "Err:SetExposureTime Failed.Exit Code:1";
|
qDebug() << "Err:SetExposureTime Failed.Exit Code:1";
|
||||||
|
/*m_pSerialPort->waitForReadyRead(5000);
|
||||||
|
m_pSerialPort->clear();*/
|
||||||
//return 1;
|
//return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
21
source/LinearShutter/VSMD12XMovementTest.cpp
Normal file
21
source/LinearShutter/VSMD12XMovementTest.cpp
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
#include "VSMD12XMovementTest.h"
|
||||||
|
|
||||||
|
MovementTest::MovementTest()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
MovementTest::~MovementTest()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void MovementTest::TestAsLinearShutter()
|
||||||
|
{
|
||||||
|
PortInfo piTemp;
|
||||||
|
piTemp.qstrFullPortName = QString::fromStdString("");
|
||||||
|
m_ctrlLS.ILMES_InitializeComm(piTemp, 1, 1);
|
||||||
|
ControllerParams cpTemp;
|
||||||
|
bool res = m_ctrlLS.ILMES_InitializeParams(cpTemp);
|
||||||
|
//m_ctrlLS.ILMES_SetPosition(m_struAcqPosSetting.iPosition, m_struAcqPosSetting.iTotalPosition);
|
||||||
|
}
|
||||||
|
|
11
source/LinearShutter/VSMD12XMovementTest.h
Normal file
11
source/LinearShutter/VSMD12XMovementTest.h
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
#include "VSMD12XControl.h"
|
||||||
|
class MovementTest
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
MovementTest();
|
||||||
|
~MovementTest();
|
||||||
|
private:
|
||||||
|
CVSMD12XControl m_ctrlLS;
|
||||||
|
public:
|
||||||
|
void TestAsLinearShutter();
|
||||||
|
};
|
Reference in New Issue
Block a user