mirror of
http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git
synced 2025-10-19 11:49:42 +08:00
1.解决了移动到绝对位置时,位置和标定程序给出的位置不一样的问题。原因是从极近位置归零时,原点位置不一致。
2.解决了一些小瑕疵,此版本将作为Beta Version 1.0发布。
This commit is contained in:
23
main.cpp
23
main.cpp
@ -47,11 +47,6 @@ int main(int argc, char *argv[])
|
||||
//////////////////////////////////////////////////////////////////////////logger
|
||||
///create main system logger
|
||||
//QT_LOG::ZZ_InitLogger("/home/data/Log/");
|
||||
|
||||
|
||||
//m_test123;
|
||||
//m_test123.Initialize("COM11");
|
||||
//m_test123.GetHumiture(fTemp, fHum);
|
||||
//////////////////////////////////////////////////////////////////////////config
|
||||
///turn on power supply
|
||||
system("gpio write 1 1");//<2F>豸<EFBFBD>ϵ<EFBFBD>
|
||||
@ -70,6 +65,7 @@ int main(int argc, char *argv[])
|
||||
m_dfpSaver.SetManmadeEnviromentalContext(m_struMEC);
|
||||
|
||||
m_mduUploader.SetContext(m_struEC, m_struMEC);
|
||||
m_mduUploader.Initialize();
|
||||
//m_ctrlHumitureDetector.Initialize(m_struHumitureDI.qstrInterfaceName.toStdString());
|
||||
//////////////////////////////////////////////////////////////////////////prepare
|
||||
m_sTimer.Preheating();
|
||||
@ -174,6 +170,23 @@ int main(int argc, char *argv[])
|
||||
// m_ctrlATP.GetDeviceAttribute();
|
||||
// m_ctrlATP.SetExposureTime(m_ctrlATP.m_adaDeviceAttr.iMinIntegrationTime);
|
||||
// m_ctrlATP.RecvData(qbTest);
|
||||
//m_test123;
|
||||
//m_test123.Initialize("COM11");
|
||||
//m_test123.GetHumiture(fTemp, fHum);
|
||||
// int aaaaa = sizeof(unsigned long int);
|
||||
// CalFrame OneFile;
|
||||
// QString aa = "C:/Users/ZhangZhuo/Desktop/qepro.cal";
|
||||
// QFile qfCalFile(aa);
|
||||
// bRes = qfCalFile.open(QFile::ReadOnly);
|
||||
// using namespace ZZ_MISCDEF;
|
||||
// qfCalFile.read((char *)&OneFile.uiExposureTimeInMS, sizeof(ZZ_U32));//U32
|
||||
// qfCalFile.read((char*)&OneFile.fTemperature, sizeof(double));
|
||||
// qfCalFile.read((char*)&OneFile.iPixels, sizeof(int));
|
||||
// qfCalFile.read((char*)OneFile.fWaveLength, sizeof(double)*OneFile.iPixels);
|
||||
// qfCalFile.read((char*)OneFile.dCal_Gain, sizeof(double)*OneFile.iPixels);
|
||||
// qfCalFile.read((char*)OneFile.dCal_Offset, sizeof(double)*OneFile.iPixels);
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
return a.exec();
|
||||
|
Reference in New Issue
Block a user