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

misc

Browse Source
This commit is contained in:
zhangzhuo
2021-12-21 17:37:48 +08:00
parent 2ab5c91d76
commit fbb1597bb5
7 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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,8 @@ bool DataFileProcessor::WriteEnvironmentInfo()
qDebug() << m_qstrFullFileName;
//EC
qfData.write("EnvironmentalContext,");
qfData.write("DEV_SN,");
qfData.write(m_struEC.qstrDEV_SN.toLatin1());
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

11
source/Settings/SystemConfigger.cpp
View File

@ -210,11 +210,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();

6
source/Thread/AbstractFSController.cpp
View File

@ -215,12 +215,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";

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();

16
source/Thread/Scheduler.cpp
View File

@ -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;
}