mirror of
http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git
synced 2025-10-19 19:49:42 +08:00
修改了电机部分控制代码&错误打印,优化了电机错误的信息输出。温湿度传感器修改
This commit is contained in:
@ -504,7 +504,7 @@ int CMainDataGrabber::GrabOnceFinished()
|
||||
{
|
||||
if (m_struLinearShutterContext.ucProtocolType == 100)
|
||||
{
|
||||
if (i==0)
|
||||
if (/*i==0*/i%2==0)
|
||||
{
|
||||
qstrCMD_Temp = QString::fromStdString(m_vecDSS[0].strChannelA);
|
||||
qstrCMD_A = "gpio write " + qstrCMD_Temp + " 1";
|
||||
@ -520,7 +520,7 @@ int CMainDataGrabber::GrabOnceFinished()
|
||||
|
||||
Delay_MSec(500);
|
||||
}
|
||||
if (i==1)
|
||||
else if (/*i==1*/i%2==1)
|
||||
{
|
||||
qstrCMD_Temp = QString::fromStdString(m_vecDSS[0].strChannelA);
|
||||
qstrCMD_A = "gpio write " + qstrCMD_Temp + " 0";
|
||||
@ -634,6 +634,8 @@ int CMainDataGrabber::GrabOnceFinished()
|
||||
m_pmduUploader->SetData(vecData);
|
||||
emit SignalPushOneDataFrame();
|
||||
m_pdfpSaver->SetData(vecData);
|
||||
|
||||
qDebug() << "Thread Data Server: WriteDataFile Called";
|
||||
m_pdfpSaver->WriteDataFile();
|
||||
m_iFlagIsCapturing = 0;
|
||||
|
||||
|
@ -25,6 +25,7 @@ void Scheduler::SetAcqTimeParams(AcqTimeSettings struAcqTime)
|
||||
void Scheduler::Preheating()
|
||||
{
|
||||
qDebug() << "Start Preheating";
|
||||
//QThread::msleep(5000);
|
||||
#ifdef _DEBUG
|
||||
QThread::msleep(5000);
|
||||
#else
|
||||
|
Reference in New Issue
Block a user