xin/TowerOptoSifAndSpectral
1
0
Fork 0
mirror of http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git synced 2025-10-20 11:59:42 +08:00
Code Issues Projects Releases Wiki Activity

修改了电机运动判断函数，添加了尝试机制。其他小bug/同步等修改。测试版本号:beta 1.0

Browse Source
This commit is contained in:
zhangzhuo
2021-12-23 14:42:52 +08:00
parent fbb1597bb5
commit a811677952
9 changed files with 136 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/Thread/AbstractFSController.cpp
View File

@ -107,6 +107,8 @@ int CAbstractFSController::PerformAutoExposure()
float fPredictedExposureTime;
int iDeviceDepth = (int)m_fsInfo.lDepth;
qDebug() << "MAX---Min" << m_fsInfo.fMaxFactor << "---" << m_fsInfo.fMinFactor;
bool bFlagIsOverTrying = false;
bool bFlagIsLowerMinExposureTime = false;
bool bFlagIsOverMaxExposureTime = false;
@ -163,6 +165,8 @@ int CAbstractFSController::PerformAutoExposure()
}
double dTemp = dSum / iCount;
qDebug() << "Avg " << dTemp;
if (dTemp >= iDeviceDepth * 0.99)
{
bIsValueOverflow = true;
@ -178,6 +182,7 @@ int CAbstractFSController::PerformAutoExposure()
else if (iDeviceDepth * m_fsInfo.fMaxFactor >= dTemp && dTemp >= iDeviceDepth * m_fsInfo.fMinFactor)
{
qDebug() << "trace bFlagIsAutoExposureOK =1" << iExposureTime;
bFlagIsAutoExposureOK = 1;
}
else if (dTemp > iDeviceDepth * m_fsInfo.fMaxFactor)
@ -305,7 +310,7 @@ int CAbstractFSController::StartAcquisitionSignal()
//PerformAutoExposure();
PerformAutoExposure();
TakeSignalFrame();
qDebug() << "Stop acq Signal" << " Thread ID:" << m_iThreadID;

2
source/Thread/Scheduler.cpp
View File

@ -27,7 +27,7 @@ void Scheduler::Preheating()
#ifdef _DEBUG
QThread::msleep(5000);
#else
QThread::msleep(1000*60*5);
QThread::msleep(10000);//NEED TO CHANGE BEFOR HAND TO CUSTOM
#endif
qDebug() << "Preheating Finished";
}