mirror of
http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git
synced 2025-10-20 03:49:43 +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
|
||||
|
@ -37,9 +37,16 @@ void DataFileProcessor::SetData(std::vector<std::vector<DataFrame>> vecData)
|
||||
|
||||
bool DataFileProcessor::WriteDataFile()
|
||||
{
|
||||
//qDebug() << "start Thread Data Server GenerateFilePath";
|
||||
GenerateFilePath();
|
||||
|
||||
//qDebug() << "start Thread Data Server WriteEnvironmentInfo";
|
||||
WriteEnvironmentInfo();
|
||||
|
||||
//qDebug() << "start Thread Data Server WriteDeviceInfo";
|
||||
WriteDeviceInfo();
|
||||
|
||||
//qDebug() << "start Thread Data Server WriteData";
|
||||
WriteData();
|
||||
return 1;
|
||||
}
|
||||
|
@ -222,7 +222,7 @@ bool CVSMD12XControl::InitController()
|
||||
|
||||
bool CVSMD12XControl::GetStatus(MSInfo &stuMotorParam)
|
||||
{
|
||||
std::string strCMD = "cts\n";
|
||||
std::string strCMD = "sts\n";
|
||||
|
||||
if (m_iProtocolType)
|
||||
{
|
||||
@ -1432,7 +1432,7 @@ bool CVSMD12XControl::IsMotionFinished()
|
||||
QThread::msleep(200);
|
||||
//Delay_MSec(200);
|
||||
GetStatus(m_stuMSInfo);
|
||||
ZZ_U8 ucFlag = m_stuMSInfo.uiFlags & 0x000000FF;
|
||||
ZZ_U8 ucFlag = m_stuMSInfo.uiFlags & 0x00FFFFFF;
|
||||
ucFlag = ucFlag & 0x10;
|
||||
if (m_stuMSInfo.fVelocity == 0)
|
||||
{
|
||||
@ -1445,15 +1445,21 @@ bool CVSMD12XControl::IsMotionFinished()
|
||||
}
|
||||
if (iCountStopped>=50)
|
||||
{
|
||||
QString str = QString("%1").arg(m_stuMSInfo.uiFlags, 30, 2, QChar('0'));
|
||||
qDebug() <<"Warning.Motion Err,should be stopped already.checking register and retry...";
|
||||
qDebug() <<"motion status:"<<ucFlag<<"all status:"<<QString::number(m_stuMSInfo.uiFlags,2);
|
||||
qDebug() << "velocity:" << m_stuMSInfo.fVelocity;
|
||||
qDebug() << "position:" << m_stuMSInfo.iPosition;
|
||||
qDebug() << "motion status:" << ucFlag << "all status:" << str;
|
||||
bFlagIsStopped = true;
|
||||
return false;
|
||||
}
|
||||
if (iCountTotal>1000)
|
||||
{
|
||||
qDebug() << "Err.Motor Hardware Err,should be stopped already";
|
||||
qDebug() << "motion status:" << ucFlag << "all status:" << QString::number(m_stuMSInfo.uiFlags, 2);
|
||||
QString str = QString("%1").arg(m_stuMSInfo.uiFlags, 30, 2, QChar('0'));
|
||||
qDebug() << "Warning.Motion Err,should be stopped already.checking register and retry...";
|
||||
qDebug() << "velocity:" << m_stuMSInfo.fVelocity;
|
||||
qDebug() << "position:" << m_stuMSInfo.iPosition;
|
||||
qDebug() << "motion status:" << ucFlag << "all status:" << str;
|
||||
bFlagIsStopped = true;
|
||||
return false;
|
||||
}
|
||||
|
Reference in New Issue
Block a user