tangchao0503/IRIS_FODIS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加了对/proc/mounts下硬件列表的检测功能，无法识别到TF卡挂在的话 程序将闪灯提示异常，不再继续执行

Browse Source
This commit is contained in:
卓 张
2024-07-09 15:45:32 +08:00
parent 3ce267dccf
commit b3b07908ea
12 changed files with 118 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Calibration/MakeDarkCurrentTable.cpp
View File

@ -186,8 +186,8 @@ int MakeDCT::LoadTable()
bool bRes = qfData.open(QFile::ReadOnly);
if (!bRes)
{
//qDebug() << "LoadTable open Failed.";
printf("LoadTable open Failed.");
qDebug() << "LoadTable open Failed.";
//printf("LoadTable open Failed.");
return 1;
}
QString qstrTemp;
@ -202,7 +202,7 @@ int MakeDCT::LoadTable()
for (int i=0;i< qsList.size()-1;i++)
{
dfTemp.lData[i] = qsList[i + 1].toInt();
qDebug() << qsList[i] << ";";
//qDebug() << qsList[i] << ";";
}
m_vecDataFrame.push_back(dfTemp);
qDebug() << qsList.size() << endl;

4
Source/FS/ATPControl_Serial_QT.cpp
View File

@ -655,7 +655,7 @@ int ZZ_ATPControl_Serial_Qt::SingleShot(DataFrame& dfData)
qbSend.resize(3);
// qbSend[1] = 0x00;
// qbSend[2] = 0x01;
qbSend[1] = m_iExposureTime >> 8;;
qbSend[1] = m_iExposureTime >> 8;
qbSend[2] = m_iExposureTime & 0xFF;
int iRes = SendCommand(qbSend);
if (iRes != 0)
@ -691,8 +691,6 @@ int ZZ_ATPControl_Serial_Qt::SingleShot(DataFrame& dfData)
for (size_t i = 0; i < iDataSizeInPixel; i++)
{
dfData.lData[i] = qToBigEndian(usData[i]);
}
// for (int i = 0; i < iDataSizeInPixel; i++)
// {

14
Source/FS/DataFileProcessor.cpp
View File

@ -191,9 +191,17 @@ void DataFileProcessor::RecoverBackground(QString qstrDataFileName, QString qstr
vecExpotime.push_back(dfDataTemp.usExposureTimeInMS);
vecDTime.push_back(dfDataTemp.dTimes);
int iB = dfDataTemp.usExposureTimeInMS % 10;
m_dfBackground = m_vecDataFrame[iB];
if (dfDataTemp.usExposureTimeInMS<10)
{
int iB = dfDataTemp.usExposureTimeInMS % 10;
m_dfBackground = m_vecDataFrame[iB];
}
else if (dfDataTemp.usExposureTimeInMS >=10&& dfDataTemp.usExposureTimeInMS<=99)
{
int iA = dfDataTemp.usExposureTimeInMS / 10;
m_dfBackground = m_vecDataFrame[8 + iA];
}
for (int i = 0; i < 2048 ; i++)
{

7
Source/GPS/BD357Ctrl.cpp
View File

@ -152,6 +152,13 @@ int BD357Controller::Initialize(GPSInfo &struGPSI)
int BD357Controller::VSlot_SkipSyncDateOnce()
{
emit Signal_StartCapture();
qDebug() << "Signal_StartCapture";
return 0;
}
int BD357Controller::ZZ_FormatTime(ZZ_U8 u8Year, ZZ_U8 u8Month, ZZ_U8 u8Day, ZZ_U8 u8Hour, ZZ_U8 u8Minute, ZZ_U8 u8Second)
{
int iYear = u8Year + 2000;

3
Source/GPS/BD357Ctrl.h
View File

@ -24,6 +24,9 @@ public:
int SyncDateOnce();
int StartContinuousUpdating();
int Initialize(GPSInfo &struGPSI);
//test func
int VSlot_SkipSyncDateOnce();
private:
int ZZ_FormatTime(ZZ_U8 u8Year,ZZ_U8 u8Month, ZZ_U8 u8Day, ZZ_U8 u8Hour, ZZ_U8 u8Minute, ZZ_U8 u8Second);
public slots: