xin/TowerOptoSifAndSpectral
1
0
Fork 0
mirror of http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git synced 2025-10-19 03:49:42 +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

24
main.cpp
View File

@ -16,6 +16,9 @@ int main(int argc, char *argv[])
using namespace ZZ_MISCDEF::MISC_DETECTOR; using namespace ZZ_MISCDEF::MISC_DETECTOR;
QCoreApplication a(argc, argv); QCoreApplication a(argc, argv);
system("gpio mode 1 output");//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ų<EFBFBD>ʼ<EFBFBD><CABC>
qDebug() << "gpio mode 1 output......" << endl;
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
//// ////
GY39Controller m_ctrlHumitureDetector; GY39Controller m_ctrlHumitureDetector;
@ -40,6 +43,9 @@ int main(int argc, char *argv[])
//m_test123.Initialize("COM11"); //m_test123.Initialize("COM11");
//m_test123.GetHumiture(fTemp, fHum); //m_test123.GetHumiture(fTemp, fHum);
//////////////////////////////////////////////////////////////////////////config //////////////////////////////////////////////////////////////////////////config
system("gpio write 1 1");//<2F>豸<EFBFBD>ϵ<EFBFBD>
qDebug() << "gpio write 1 1......" << endl;
bRes = m_scConfiggerLoader.Initialize(); bRes = m_scConfiggerLoader.Initialize();
if (bRes) if (bRes)
{ {
@ -55,8 +61,10 @@ int main(int argc, char *argv[])
m_ctrlHumitureDetector.Initialize(m_struHumitureDI.qstrInterfaceName.toStdString()); m_ctrlHumitureDetector.Initialize(m_struHumitureDI.qstrInterfaceName.toStdString());
//////////////////////////////////////////////////////////////////////////prepare //////////////////////////////////////////////////////////////////////////prepare
m_sTimer.Preheating(); m_sTimer.Preheating();
m_ctrlHumitureDetector.GetHumiture_retry(m_fChassisTemp, m_fChassisHum); m_ctrlHumitureDetector.GetHumiture_retry(m_fChassisTemp, m_fChassisHum);
m_struEC.qstrCaseTemperature= QString("%1").arg(m_fChassisTemp);
m_struEC.qstrCaseHumidity = QString("%1").arg(m_fChassisHum);
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
QThread* m_pqDataGrabberThreadHolder = new QThread(); QThread* m_pqDataGrabberThreadHolder = new QThread();
QThread* m_pqTimerThreadHolder = new QThread(); QThread* m_pqTimerThreadHolder = new QThread();
@ -112,28 +120,28 @@ int main(int argc, char *argv[])
//testDG.SetupMsgPipelines(); //testDG.SetupMsgPipelines();
//testDG.StartWorkers(); //testDG.StartWorkers();
//testDG.StartGrab(); //testDG.StartGrab();
//
//QThread* m_pqTimerThreadHolder = new QThread(); //QThread* m_pqTimerThreadHolder = new QThread();
//testS.moveToThread(m_pqTimerThreadHolder); //testS.moveToThread(m_pqTimerThreadHolder);
//m_pqTimerThreadHolder->start(); //m_pqTimerThreadHolder->start();
//testS.SelfStart(); //testS.SelfStart();
//
//QString qstrTest = "This is a test message 2"; //QString qstrTest = "This is a test message 2";
//qDebug() << qstrTest; //qDebug() << qstrTest;
//cout << "This is a test message"; //cout << "This is a test message";
//
//test.LoadSettings_Test(); //test.LoadSettings_Test();
//
//ZZ_DataGrabberThread m_test; //ZZ_DataGrabberThread m_test;
//m_test.GrabOnce(); //m_test.GrabOnce();
//QThread* m_pqDataGrabberThreadHolder; //QThread* m_pqDataGrabberThreadHolder;
//
//
//m_pqDataGrabberThreadHolder->start(); //m_pqDataGrabberThreadHolder->start();
//m_test.TestGrabOnce(); //m_test.TestGrabOnce();
//m_test.StartGrabCall(); //m_test.StartGrabCall();
//QThread::msleep(5000); //QThread::msleep(5000);
//
//m_test.StopTestGrab(); //m_test.StopTestGrab();
// ZZ_ATPControl_Serial_Qt m_ctrlATP; // ZZ_ATPControl_Serial_Qt m_ctrlATP;
// QByteArray qbTest; // QByteArray qbTest;

4
source/FS/DataFileProcessor.cpp
View File

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

2
source/FS/ZZ_Types.h
View File

@ -241,7 +241,7 @@ namespace ZZ_MISCDEF
QString qstrGPS_North; QString qstrGPS_North;
QString qstrCaseTemperature; QString qstrCaseTemperature;
QString qstrCaseHumidity; QString qstrCaseHumidity;
QString qstrDEV_SN;
}EContext; }EContext;
typedef struct tagManmadeEnviromentalContext typedef struct tagManmadeEnviromentalContext

1
source/Settings/SystemConfigger.cpp
View File

@ -215,6 +215,7 @@
m_struEC.qstrGPS_Latitude = m_qjoJObj.value("GPS_Latitude").toString(); m_struEC.qstrGPS_Latitude = m_qjoJObj.value("GPS_Latitude").toString();
m_struEC.qstrGPS_Longtitude = m_qjoJObj.value("GPS_Longtitude").toString(); m_struEC.qstrGPS_Longtitude = m_qjoJObj.value("GPS_Longtitude").toString();
m_struEC.qstrGPS_North = m_qjoJObj.value("GPS_North").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.qstrInstallationTime = m_qjoJObj.value("InstallationTime").toString();
m_struMEC.qstrISIFCalibrationTime = m_qjoJObj.value("ISIFCalibrationTime").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; bIsLastValueOverflow = bIsValueOverflow;
fLastExposureTime = fTempExposureTime; fLastExposureTime = fTempExposureTime;
if (iExposureTime > 30000) if (iExposureTime > 120000)
{ {
bFlagIsAutoExposureOK = false; bFlagIsAutoExposureOK = false;
bFlagIsAutoExposureFailed = true; bFlagIsAutoExposureFailed = true;
float fPredictedExposureTime = 30000; float fPredictedExposureTime = 120000;
iRes = m_pFSCtrl->SetExposureTime(30000); iRes = m_pFSCtrl->SetExposureTime(120000);
if (iRes != 0) if (iRes != 0)
{ {
qDebug() << "Err:PerformAutoExposure Failed.Exit Code:3"; 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() int CMainDataGrabber::StartGrabTimer()
{ {
//////////////////////////////////////////////////////////////////////////start //////////////////////////////////////////////////////////////////////////start
////check start time ////check start time
// bool bStopWait = false; // bool bStopWait = false;
@ -296,11 +294,9 @@ int CMainDataGrabber::StartGrabTimer()
// bStopWait = true; // bStopWait = true;
// } // }
// } // }
//start //start
//int iIntervalInMS =m_struAcqTime.qtInterval.hour()*3600*1000+ m_struAcqTime.qtInterval.minute()*60*1000+ m_struAcqTime.qtInterval.second()*1000; //int iIntervalInMS =m_struAcqTime.qtInterval.hour()*3600*1000+ m_struAcqTime.qtInterval.minute()*60*1000+ m_struAcqTime.qtInterval.second()*1000;
//m_GrabTimer->start(3000); //m_GrabTimer->start(3000);
//////////////////////////////////////////////////////////////////////////test //////////////////////////////////////////////////////////////////////////test
// m_iFlagIsCapturing = true; // m_iFlagIsCapturing = true;
// emit SignalStartGrabOnce(); // emit SignalStartGrabOnce();
@ -317,8 +313,6 @@ int CMainDataGrabber::StartGrabTimer()
// QThread::msleep(1000); // QThread::msleep(1000);
// } // }
// qDebug() << "Allgrab stopped" << " Thread ID:" <<2; // qDebug() << "Allgrab stopped" << " Thread ID:" <<2;
////final test code eat my ass ////final test code eat my ass
// m_iFlagIsCapturing = 1; // m_iFlagIsCapturing = 1;
// //
@ -381,7 +375,9 @@ int CMainDataGrabber::GrabOnceFinished()
for (int i=0;i< m_struAcqPosSetting.iTotalPosition-1;i++) for (int i=0;i< m_struAcqPosSetting.iTotalPosition-1;i++)
{ {
////move to ////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_struAcqPosSetting.iPosition[i + 1];
m_iFlagIsCapturing_Signal = 1; m_iFlagIsCapturing_Signal = 1;
emit SignalStartGrabOnce_Signal(); emit SignalStartGrabOnce_Signal();
@ -392,7 +388,9 @@ int CMainDataGrabber::GrabOnceFinished()
////move to ////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_struAcqPosSetting.iPosition[0];
m_iFlagIsCapturing_Dark = 1; m_iFlagIsCapturing_Dark = 1;
emit SignalStartGrabOnce_Dark(); emit SignalStartGrabOnce_Dark();

14
source/Thread/Scheduler.cpp
View File

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