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:
任立新
2021-12-23 14:45:25 +08:00
parent 2f4b1b5a71 a811677952
commit df059ea72d
12 changed files with 182 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/FS/DataFileProcessor.cpp
View File

@ -5,7 +5,7 @@ DataFileProcessor::DataFileProcessor()
#ifdef _DEBUG
m_qstrFilePath = "E:/WorkSpace/TowerOptoSifAndSpectral/Data";
#else
m_qstrFilePath = "/ home / data / Data";
m_qstrFilePath = "/home/data/Data";
#endif // DEBUG
}
@ -84,6 +84,9 @@ bool DataFileProcessor::WriteEnvironmentInfo()
qDebug() << m_qstrFullFileName;
//EC
qfData.write("EnvironmentalContext,");
qfData.write("DEV_SN,");
qfData.write(m_struEC.qstrDEV_SN.toLatin1());
qfData.write(",");
qfData.write("CaseHumidity,");
qfData.write(m_struEC.qstrCaseHumidity.toLatin1());
qfData.write(",");

4
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
@ -241,7 +241,7 @@ namespace ZZ_MISCDEF
QString qstrGPS_North;
QString qstrCaseTemperature;
QString qstrCaseHumidity;
QString qstrDEV_SN;
}EContext;
typedef struct tagManmadeEnviromentalContext

154
source/LinearShutter/VSMD12XControl.cpp
View File

@ -80,22 +80,65 @@ void CVSMD12XControl::ILMES_SetPosition(int *piPositionInPulse, size_t szSize)
bool CVSMD12XControl::ILMES_MoveToPos(int iPositionIndex)
{
bool bFlagFailed = true;
bool bRes = false;
bRes = CVSMD12XControl::StartBackZero();
if (!bRes)
int iCount = 0;
for (int i=0;i<3;i++)
{
if (CVSMD12XControl::StartBackZero())
{
bFlagFailed = false;
break;
}
while (!bRes)
{
iCount++;
bRes = StopBackZero();
if (iCount>10)
{
qDebug() << "StopBackZero Err.Give up...";
bRes = true;
}
}
}
if (bFlagFailed)
{
qDebug() << "StartBackZero Err";
return false;
}
bRes = CVSMD12XControl::MoveTo(m_piPositionInPulses[iPositionIndex]);
if (!bRes)
bFlagFailed = true;
for (int i = 0; i < 3; i++)
{
if (MoveTo(m_piPositionInPulses[iPositionIndex]))
{
bFlagFailed = false;
break;
}
}
if (bFlagFailed)
{
qDebug() << "MoveTo Err";
return false;
}
return bRes;
return true;
// bool bRes = false;
// bRes = CVSMD12XControl::StartBackZero();
// if (!bRes)
// {
// qDebug() << "StartBackZero Err";
// return false;
// }
// bRes = CVSMD12XControl::MoveTo(m_piPositionInPulses[iPositionIndex]);
// if (!bRes)
// {
// qDebug() << "MoveTo Err";
// return false;
// }
// return bRes;
}
void CVSMD12XControl::SetProtocolType(int iProtocolType /*= 0*/)
@ -306,20 +349,20 @@ bool CVSMD12XControl::MoveTo(int iAbsPulse)
return false;
}
bool bFlagIsStopped = false;
while (!bFlagIsStopped)
{
QThread::msleep(200);
//Delay_MSec(200);
GetStatus(m_stuMSInfo);
ZZ_U8 ucFlag = m_stuMSInfo.uiFlags & 0x000000FF;
ucFlag = ucFlag & 0x10;
if (ucFlag == 0x10 && m_stuMSInfo.fVelocity == 0)
{
bFlagIsStopped = true;
}
}
return true;
// bool bFlagIsStopped = false;
// while (!bFlagIsStopped)
// {
// QThread::msleep(200);
// //Delay_MSec(200);
// GetStatus(m_stuMSInfo);
// ZZ_U8 ucFlag = m_stuMSInfo.uiFlags & 0x000000FF;
// ucFlag = ucFlag & 0x10;
// if (ucFlag == 0x10 && m_stuMSInfo.fVelocity == 0)
// {
// bFlagIsStopped = true;
// }
// }
return IsMotionFinished();
}
else
{
@ -382,20 +425,21 @@ bool CVSMD12XControl::StartBackZero()
return false;
}
bool bFlagIsStopped = false;
while (!bFlagIsStopped)
{
QThread::msleep(200);
//Delay_MSec(200);
GetStatus(m_stuMSInfo);
ZZ_U8 ucFlag = m_stuMSInfo.uiFlags & 0x000000FF;
ucFlag = ucFlag & 0x10;
if (ucFlag == 0x10 && m_stuMSInfo.fVelocity == 0)
{
bFlagIsStopped = true;
}
}
return true;
return IsMotionFinished();
// bool bFlagIsStopped = false;
// while (!bFlagIsStopped)
// {
// QThread::msleep(200);
// //Delay_MSec(200);
// GetStatus(m_stuMSInfo);
// ZZ_U8 ucFlag = m_stuMSInfo.uiFlags & 0x000000FF;
// ucFlag = ucFlag & 0x10;
// if (ucFlag == 0x10 && m_stuMSInfo.fVelocity == 0)
// {
// bFlagIsStopped = true;
// }
// }
// return true;
// return ParseReturnedString(strRecv, -1);
}
@ -1374,6 +1418,50 @@ char* CVSMD12XControl::VSMD_Split(char* cStr, char cSplit)
return NULL;
}
bool CVSMD12XControl::IsMotionFinished()
{
//true means stopped
//false means unknown status
int iCountTotal = 0;
int iCountStopped = 0;
bool bFlagIsStopped = false;
while (!bFlagIsStopped)
{
iCountTotal++;
QThread::msleep(200);
//Delay_MSec(200);
GetStatus(m_stuMSInfo);
ZZ_U8 ucFlag = m_stuMSInfo.uiFlags & 0x000000FF;
ucFlag = ucFlag & 0x10;
if (m_stuMSInfo.fVelocity == 0)
{
iCountStopped++;
}
if (ucFlag == 0x10 && m_stuMSInfo.fVelocity == 0)
{
bFlagIsStopped = true;
return true;
}
if (iCountStopped>=50)
{
qDebug() <<"Warning.Motion Err,should be stopped already.checking register and retry...";
qDebug() <<"motion status:"<<ucFlag<<"all status:"<<QString::number(m_stuMSInfo.uiFlags,2);
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);
bFlagIsStopped = true;
return false;
}
}
return false;
}
void CVSMD12XControl::Delay_MSec(ZZ_U16 usMS)
{
QEventLoop qeLoop;

3
source/LinearShutter/VSMD12XControl.h
View File

@ -139,7 +139,8 @@ private:
bool ParseReturnedParam(std::string &strRecv);
void VSMD_BitShift(ZZ_U8* src, unValue* dst);
char* VSMD_Split(char* cStr, char cSplit);
//////////////////////////////////////////////////////////////////////////sync
bool IsMotionFinished();
//////////////////////////////////////////////////////////////////////////qt
void Delay_MSec(ZZ_U16 usMS);
};

11
source/Settings/SystemConfigger.cpp
View File

@ -211,11 +211,12 @@
int ZZ_SysConfigger::LoadSettingsFromFile_MISC()
{
m_struEC.qstrLocation = m_qjoJObj.value("Location").toString();
m_struEC.qstrGPS_Altitude = m_qjoJObj.value("GPS_Altitude").toString();
m_struEC.qstrGPS_Latitude = m_qjoJObj.value("GPS_Latitude").toString();
m_struEC.qstrGPS_Longtitude = m_qjoJObj.value("GPS_Longtitude").toString();
m_struEC.qstrGPS_North = m_qjoJObj.value("GPS_North").toString();
m_struEC.qstrLocation = m_qjoJObj.value("Location").toString();
m_struEC.qstrGPS_Altitude = m_qjoJObj.value("GPS_Altitude").toString();
m_struEC.qstrGPS_Latitude = m_qjoJObj.value("GPS_Latitude").toString();
m_struEC.qstrGPS_Longtitude = m_qjoJObj.value("GPS_Longtitude").toString();
m_struEC.qstrGPS_North = m_qjoJObj.value("GPS_North").toString();
m_struEC.qstrDEV_SN = m_qjoJObj.value("Dev_SN").toString();
m_struMEC.qstrInstallationTime = m_qjoJObj.value("InstallationTime").toString();
m_struMEC.qstrISIFCalibrationTime = m_qjoJObj.value("ISIFCalibrationTime").toString();

13
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)
@ -215,12 +220,12 @@ int CAbstractFSController::PerformAutoExposure()
bIsLastValueOverflow = bIsValueOverflow;
fLastExposureTime = fTempExposureTime;
if (iExposureTime > 30000)
if (iExposureTime > 120000)
{
bFlagIsAutoExposureOK = false;
bFlagIsAutoExposureFailed = true;
float fPredictedExposureTime = 30000;
iRes = m_pFSCtrl->SetExposureTime(30000);
float fPredictedExposureTime = 120000;
iRes = m_pFSCtrl->SetExposureTime(120000);
if (iRes != 0)
{
qDebug() << "Err:PerformAutoExposure Failed.Exit Code:3";
@ -305,7 +310,7 @@ int CAbstractFSController::StartAcquisitionSignal()
//PerformAutoExposure();
PerformAutoExposure();
TakeSignalFrame();
qDebug() << "Stop acq Signal" << " Thread ID:" << m_iThreadID;

14
source/Thread/MainDataGrabber.cpp
View File

@ -283,8 +283,6 @@ int CMainDataGrabber::GrabOnceFinished_Dark()
int CMainDataGrabber::StartGrabTimer()
{
//////////////////////////////////////////////////////////////////////////start
////check start time
// bool bStopWait = false;
@ -296,11 +294,9 @@ int CMainDataGrabber::StartGrabTimer()
// bStopWait = true;
// }
// }
//start
//int iIntervalInMS =m_struAcqTime.qtInterval.hour()*3600*1000+ m_struAcqTime.qtInterval.minute()*60*1000+ m_struAcqTime.qtInterval.second()*1000;
//m_GrabTimer->start(3000);
//////////////////////////////////////////////////////////////////////////test
// m_iFlagIsCapturing = true;
// emit SignalStartGrabOnce();
@ -317,8 +313,6 @@ int CMainDataGrabber::StartGrabTimer()
// QThread::msleep(1000);
// }
// qDebug() << "Allgrab stopped" << " Thread ID:" <<2;
////final test code eat my ass
// m_iFlagIsCapturing = 1;
//
@ -381,7 +375,9 @@ int CMainDataGrabber::GrabOnceFinished()
for (int i=0;i< m_struAcqPosSetting.iTotalPosition-1;i++)
{
////move to
// m_ctrlLS.ILMES_MoveToPos(i+1);
qDebug()<<"Start ILMES_MoveToPos:"<<i+1;
m_ctrlLS.ILMES_MoveToPos(i+1);
qDebug() << "Stop ILMES_MoveToPos:" << i + 1;
m_struAcqPosSetting.iPosition[i + 1];
m_iFlagIsCapturing_Signal = 1;
emit SignalStartGrabOnce_Signal();
@ -392,7 +388,9 @@ int CMainDataGrabber::GrabOnceFinished()
////move to
// m_ctrlLS.ILMES_MoveToPos(0);
qDebug() << "Start ILMES_MoveToPos:" << 0;
m_ctrlLS.ILMES_MoveToPos(0);
qDebug() << "Stop ILMES_MoveToPos:" << 0;
m_struAcqPosSetting.iPosition[0];
m_iFlagIsCapturing_Dark = 1;
emit SignalStartGrabOnce_Dark();

18
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";
}
@ -57,14 +57,18 @@ void Scheduler::StartAsPlanned()
int Scheduler::OnTimeCounter()
{
QTime qtTime = QTime::currentTime();
if (m_struAcqTime.qtStartTime <= qtTime && qtTime < m_struAcqTime.qtStopTime)
{
return 1;
qDebug() << "Non working time. Idling......";
qDebug() << "it's time to work...work work.";
emit SignalGrabOnce();
return 0;
}
else
{
system("gpio write 1 0");//<2F>豸<EFBFBD>ϵ<EFBFBD>
qDebug() << "gpio write 1 0......"<<endl;
qDebug() << "Non working time. Idling......";
return 0;
}
emit SignalGrabOnce();
return 0;
}

0
source/Upload/DataFileTransfer.cpp Normal file
View File

3
source/Upload/DataFileTransfer.h Normal file
View File

@ -0,0 +1,3 @@
#pragma once
#include "pch.h"
#include "ZZ_Types.h"