From fbb1597bb59857353969cd4dea0b9738f986c4ae Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Tue, 21 Dec 2021 17:37:48 +0800 Subject: [PATCH] misc --- main.cpp | 24 ++++++++++++++++-------- source/FS/DataFileProcessor.cpp | 4 +++- source/FS/ZZ_Types.h | 4 ++-- source/Settings/SystemConfigger.cpp | 11 ++++++----- source/Thread/AbstractFSController.cpp | 6 +++--- source/Thread/MainDataGrabber.cpp | 14 ++++++-------- source/Thread/Scheduler.cpp | 16 ++++++++++------ 7 files changed, 46 insertions(+), 33 deletions(-) diff --git a/main.cpp b/main.cpp index e0f3726..98fd4b5 100644 --- a/main.cpp +++ b/main.cpp @@ -16,6 +16,9 @@ int main(int argc, char *argv[]) using namespace ZZ_MISCDEF::MISC_DETECTOR; QCoreApplication a(argc, argv); + + system("gpio mode 1 output");//控制针脚初始化 + qDebug() << "gpio mode 1 output......" << endl; ////////////////////////////////////////////////////////////////////////// //// GY39Controller m_ctrlHumitureDetector; @@ -40,6 +43,9 @@ int main(int argc, char *argv[]) //m_test123.Initialize("COM11"); //m_test123.GetHumiture(fTemp, fHum); //////////////////////////////////////////////////////////////////////////config + system("gpio write 1 1");//设备上电 + qDebug() << "gpio write 1 1......" << endl; + bRes = m_scConfiggerLoader.Initialize(); if (bRes) { @@ -55,8 +61,10 @@ int main(int argc, char *argv[]) m_ctrlHumitureDetector.Initialize(m_struHumitureDI.qstrInterfaceName.toStdString()); //////////////////////////////////////////////////////////////////////////prepare m_sTimer.Preheating(); - 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_pqTimerThreadHolder = new QThread(); @@ -112,28 +120,28 @@ int main(int argc, char *argv[]) //testDG.SetupMsgPipelines(); //testDG.StartWorkers(); //testDG.StartGrab(); - + // //QThread* m_pqTimerThreadHolder = new QThread(); //testS.moveToThread(m_pqTimerThreadHolder); //m_pqTimerThreadHolder->start(); //testS.SelfStart(); - + // //QString qstrTest = "This is a test message 2"; //qDebug() << qstrTest; //cout << "This is a test message"; - + // //test.LoadSettings_Test(); - + // //ZZ_DataGrabberThread m_test; //m_test.GrabOnce(); //QThread* m_pqDataGrabberThreadHolder; - - + // + // //m_pqDataGrabberThreadHolder->start(); //m_test.TestGrabOnce(); //m_test.StartGrabCall(); //QThread::msleep(5000); - + // //m_test.StopTestGrab(); // ZZ_ATPControl_Serial_Qt m_ctrlATP; // QByteArray qbTest; diff --git a/source/FS/DataFileProcessor.cpp b/source/FS/DataFileProcessor.cpp index 13ff215..3cbcb08 100644 --- a/source/FS/DataFileProcessor.cpp +++ b/source/FS/DataFileProcessor.cpp @@ -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(","); diff --git a/source/FS/ZZ_Types.h b/source/FS/ZZ_Types.h index f666bda..ff54590 100644 --- a/source/FS/ZZ_Types.h +++ b/source/FS/ZZ_Types.h @@ -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 diff --git a/source/Settings/SystemConfigger.cpp b/source/Settings/SystemConfigger.cpp index d126eba..facd7e9 100644 --- a/source/Settings/SystemConfigger.cpp +++ b/source/Settings/SystemConfigger.cpp @@ -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(); diff --git a/source/Thread/AbstractFSController.cpp b/source/Thread/AbstractFSController.cpp index 39f868e..c76f235 100644 --- a/source/Thread/AbstractFSController.cpp +++ b/source/Thread/AbstractFSController.cpp @@ -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"; diff --git a/source/Thread/MainDataGrabber.cpp b/source/Thread/MainDataGrabber.cpp index 93c7ace..c0a5623 100644 --- a/source/Thread/MainDataGrabber.cpp +++ b/source/Thread/MainDataGrabber.cpp @@ -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:"<