diff --git a/CMakeSettings.json b/CMakeSettings.json index 95624be..19e498b 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -2,22 +2,22 @@ "configurations": [ { "name": "Linux-GCC-Debug", - "generator": "Unix Makefiles", - "configurationType": "Release", - "cmakeExecutable": "/opt/cmake/bin/cmake", + "generator": "Ninja", + "configurationType": "Debug", + "cmakeExecutable": "/zz/cmake-3.29.3/bin/cmake", "remoteCopySourcesExclusionList": [ ".vs", ".git", "out" ], "buildCommandArgs": "", "ctestCommandArgs": "", "inheritEnvironments": [ "linux_arm" ], - "intelliSenseMode": "linux-gcc-x64", - "remoteMachineName": "437198504;172.16.0.96 (username=root, port=22, authentication=Password)", + "remoteMachineName": "-1273990714;172.16.0.61 (username=root, port=22, authentication=Password)", "remoteCMakeListsRoot": "/home/pi/SIF0/src", "remoteBuildRoot": "/home/pi/SIF0/out/build_d/${name}", "remoteInstallRoot": "/home/pi/SIF0/out/install/${name}", "remoteCopySources": true, "rsyncCommandArgs": "-t --delete --delete-excluded", "remoteCopyBuildOutput": true, - "remoteCopySourcesMethod": "rsync" + "remoteCopySourcesMethod": "rsync", + "remoteCopyUseCompilerDefaults": false }, { "name": "x64-Debug", diff --git a/CmakeLists.txt b/CmakeLists.txt index 222618c..d7dbd03 100644 --- a/CmakeLists.txt +++ b/CmakeLists.txt @@ -1,5 +1,4 @@ -cmake_minimum_required(VERSION 3.3) - +cmake_minimum_required(VERSION 3.5) project(TowerOptoSifAndSpectral) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) diff --git a/main.cpp b/main.cpp index 226dee1..1e23023 100644 --- a/main.cpp +++ b/main.cpp @@ -23,6 +23,9 @@ int main(int argc, char *argv[]) //////////////////////////////////////////////////////////////////////////// //system("gpio mode 1 output");//������ų�ʼ�� //qDebug() << "gpio mode 1 output......" << endl; + // + //ZZ_ATPControl_Serial_Qt test; + //test.Initialize(0, "/dev/ttyS1", "2223344"); ////////////////////////////////////////////////////////////////////////// //// GY39Controller m_ctrlHumitureDetector; @@ -91,7 +94,7 @@ int main(int argc, char *argv[]) //m_mduUploader.Initialize(); m_ctrlHumitureDetector.Initialize(m_struHumitureDI.qstrInterfaceName.toStdString()); //////////////////////////////////////////////////////////////////////////prepare - m_sTimer.Preheating(); + //m_sTimer.Preheating(); m_ctrlHumitureDetector.GetHumiture_retry(m_fChassisTemp, m_fChassisHum); m_ctrlHumitureDetector.GetHumiture_retry(m_fChassisTemp, m_fChassisHum); diff --git a/source/CaptureThread/MainDataGrabber.cpp b/source/CaptureThread/MainDataGrabber.cpp index f451e66..4c4d653 100644 --- a/source/CaptureThread/MainDataGrabber.cpp +++ b/source/CaptureThread/MainDataGrabber.cpp @@ -7,6 +7,7 @@ CMainDataGrabber::CMainDataGrabber(QObject* parent /*= nullptr*/) //m_GrabTimer = new QTimer(this); + m_iFlagIsWorkingTime = 1; m_iFlagIsCapturing = false; m_iFlagIsCapturing_Signal = false; m_iFlagIsCapturing_Dark = false; @@ -459,6 +460,8 @@ int CMainDataGrabber::GrabOnceFinished() int CMainDataGrabber::OnTimeCounter() { + m_iFlagIsWorkingTime = 1; + bool bRes; QString qstrCMD_A,qstrCMD_B,qstrCMD_Temp; @@ -630,13 +633,16 @@ int CMainDataGrabber::GrabOnceFinished() //vecData[i].push_back(); } - //emit SignalPushOneDataFrame(vecData); - m_pmduUploader->SetData(vecData); - emit SignalPushOneDataFrame(); - m_pdfpSaver->SetData(vecData); + if (m_iFlagIsWorkingTime) + { + //emit SignalPushOneDataFrame(vecData); + m_pmduUploader->SetData(vecData); + emit SignalPushOneDataFrame(); + m_pdfpSaver->SetData(vecData); + qDebug() << "Thread Data Server: WriteDataFile Called"; + m_pdfpSaver->WriteDataFile(); + } - qDebug() << "Thread Data Server: WriteDataFile Called"; - m_pdfpSaver->WriteDataFile(); m_iFlagIsCapturing = 0; // qDebug() << "-------------------------------------------busy" << QTime::currentTime().toString(); @@ -681,6 +687,9 @@ int CMainDataGrabber::GrabOnceFinished() int CMainDataGrabber::OnZeroHoldCurrent() { + /// + m_iFlagIsWorkingTime = 0; + /// bool bRes = m_ctrlLS.SetHoldCurrent(0); if (!bRes) { diff --git a/source/CaptureThread/MainDataGrabber.h b/source/CaptureThread/MainDataGrabber.h index 856f7be..ee4f316 100644 --- a/source/CaptureThread/MainDataGrabber.h +++ b/source/CaptureThread/MainDataGrabber.h @@ -28,6 +28,7 @@ private: int m_iTotalThreads; + int m_iFlagIsWorkingTime; int m_iFlagIsCapturing; int m_iFlagIsCapturing_Signal; int m_iFlagIsCapturing_Dark; diff --git a/source/CaptureThread/Scheduler.cpp b/source/CaptureThread/Scheduler.cpp index 5fd8240..25b973c 100644 --- a/source/CaptureThread/Scheduler.cpp +++ b/source/CaptureThread/Scheduler.cpp @@ -29,7 +29,7 @@ void Scheduler::Preheating() #ifdef _DEBUG QThread::msleep(5000); #else - QThread::msleep(900000);//NEED TO CHANGE BEFOR HAND TO CUSTOM + QThread::msleep(900000);//NEED TO CHANGE BEFOR HAND TO CUSTOMER #endif qDebug() << "Preheating Finished"; } diff --git a/source/FS/ATPControl_Serial_QT.cpp b/source/FS/ATPControl_Serial_QT.cpp index 4ca227a..6fc07fe 100644 --- a/source/FS/ATPControl_Serial_QT.cpp +++ b/source/FS/ATPControl_Serial_QT.cpp @@ -43,14 +43,16 @@ int ZZ_ATPControl_Serial_Qt::Initialize(bool bIsUSBMode, std::string ucPortNumbe //connect(this, &ZZ_ATPControl_Serial_Qt::SignalInit_Self, this, &ZZ_ATPControl_Serial_Qt::Init_Self); //emit SignalInit_Self(); - QString qstrPortName = QString::fromStdString(ucPortNumber); + qstrInitPortName = QString::fromStdString(ucPortNumber); + qstrInitDeviceSN = QString::fromStdString(strDeviceName); - m_pSerialPort->setPortName(qstrPortName); + m_pSerialPort->setPortName(qstrInitPortName); m_pSerialPort->setReadBufferSize(512); bool bRes = m_pSerialPort->setBaudRate(m_iBaudRate); if (!bRes) { - qDebug() << "Err:setBaudRate Failed.Exit Code:1"; + qDebug() << "FS Err:setBaudRate Failed.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; //std::cout << "Err.setBaudRate Failed" << std::endl; return 1; } @@ -58,7 +60,8 @@ int ZZ_ATPControl_Serial_Qt::Initialize(bool bIsUSBMode, std::string ucPortNumbe bRes = m_pSerialPort->open(QIODevice::ReadWrite); if (!bRes) { - qDebug() << "Err:open Failed.Exit Code:2"; + qDebug() << "FS Err:open Failed.Exit Code:2"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; //std::cout << "Err.open Failed" << std::endl; return 2; } @@ -78,6 +81,7 @@ int ZZ_ATPControl_Serial_Qt::Initialize(bool bIsUSBMode, std::string ucPortNumbe if (szPostion == std::string::npos) { qDebug() << "Err:FS serial number not match.Exit Code:3"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 3; } else @@ -102,18 +106,21 @@ int ZZ_ATPControl_Serial_Qt::GetDeviceInfo(DeviceInfo &Info) if (iRes != 0) { qDebug() << "Err:GetDeviceInfo Failed,Communication error.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } iRes = RecvData(qbRecv); if (iRes != 0) { qDebug() << "Err:GetDeviceInfo Failed,Communication error.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } iRes = ParseData(qbRecv); if (iRes != 0) { qDebug() << "Err:GetDeviceInfo Failed,Communication error.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } m_diDeviceInfo.strPN = qbRecv.data(); @@ -125,18 +132,21 @@ int ZZ_ATPControl_Serial_Qt::GetDeviceInfo(DeviceInfo &Info) if (iRes != 0) { qDebug() << "Err:GetDeviceInfo Failed,Communication error.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } iRes = RecvData(qbRecv); if (iRes != 0) { qDebug() << "Err:GetDeviceInfo Failed,Communication error.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } iRes = ParseData(qbRecv); if (iRes != 0) { qDebug() << "Err:GetDeviceInfo Failed,Communication error.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } m_diDeviceInfo.strSN = qbRecv.data(); @@ -157,18 +167,21 @@ int ZZ_ATPControl_Serial_Qt::GetDeviceAttribute(DeviceAttribute &Attr) if (iRes != 0) { qDebug() << "Err:GetDeviceAttribute Failed,Communication error.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } iRes = RecvData(qbRecv); if (iRes != 0) { qDebug() << "Err:GetDeviceAttribute Failed,Communication error.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } iRes = ParseData(qbRecv); if (iRes != 0) { qDebug() << "Err:GetDeviceAttribute Failed,Communication error.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } m_daDeviceAttr.iMinIntegrationTimeInMS = (ZZ_U8)qbRecv[1] + (ZZ_U8)qbRecv[0] * 256; @@ -180,18 +193,21 @@ int ZZ_ATPControl_Serial_Qt::GetDeviceAttribute(DeviceAttribute &Attr) if (iRes != 0) { qDebug() << "Err:GetDeviceAttribute Failed,Communication error.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } iRes = RecvData(qbRecv); if (iRes != 0) { qDebug() << "Err:GetDeviceAttribute Failed,Communication error.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } iRes = ParseData(qbRecv); if (iRes != 0) { qDebug() << "Err:GetDeviceAttribute Failed,Communication error.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } m_daDeviceAttr.iMaxIntegrationTimeInMS = (ZZ_U8)qbRecv[1] + (ZZ_U8)qbRecv[0] * 256; @@ -204,12 +220,14 @@ int ZZ_ATPControl_Serial_Qt::GetDeviceAttribute(DeviceAttribute &Attr) if (iRes != 0) { qDebug() << "Err:GetDeviceAttribute Failed,Call SetExposureTime error.Exit Code:2"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; //return 2; } iRes = SingleShot(m_daDeviceAttr.iPixels); if (iRes != 0) { qDebug() << "Err:GetDeviceAttribute Failed,Call SingleShot error.Exit Code:3"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 3; } @@ -225,18 +243,21 @@ int ZZ_ATPControl_Serial_Qt::GetDeviceAttribute(DeviceAttribute &Attr) if (iRes != 0) { qDebug() << "Err:GetDeviceAttribute Failed,Communication error.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } iRes = RecvData(qbRecv); if (iRes != 0) { qDebug() << "Err:GetDeviceAttribute Failed,Communication error.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } iRes = ParseData(qbRecv); if (iRes != 0) { qDebug() << "Err:GetDeviceAttribute Failed,Communication error.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } float fWaveLengthCoef[4]; @@ -269,18 +290,21 @@ int ZZ_ATPControl_Serial_Qt::SetAvgTimes(int iTimes /*= 1*/) if (iRes != 0) { qDebug() << "Err:SetAvgTimes Failed.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } iRes = RecvData(qbRecv); if (iRes != 0) { qDebug() << "Err:SetAvgTimes Failed.Exit Code:2"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 2; } iRes = ParseData(qbRecv); if (iRes != 0) { qDebug() << "Err:SetAvgTimes Failed.Exit Code:3"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 3; } return 0; @@ -299,18 +323,21 @@ int ZZ_ATPControl_Serial_Qt::GetExposureTime_Init() if (iRes != 0) { qDebug() << "Err:GetExposureTime Failed.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } iRes = RecvData(qbRecv); if (iRes != 0) { qDebug() << "Err:GetExposureTime Failed.Exit Code:2"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 2; } iRes = ParseData(qbRecv); if (iRes != 0) { qDebug() << "Err:GetExposureTime Failed.Exit Code:3"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 3; } @@ -343,6 +370,7 @@ int ZZ_ATPControl_Serial_Qt::SendCommand(QByteArray qbCommand) if (qi64Write != qbSend.size()) { qDebug() << "Err:write Failed.Exit Code:1" << qi64Write; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } @@ -365,6 +393,7 @@ int ZZ_ATPControl_Serial_Qt::RecvData(QByteArray &qbData) if (iCounter > 150) { qDebug() << "Err:RecvData Failed,Not Enough Data.Exit Code:1" << qbData.size(); + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } iCounter++; @@ -373,6 +402,7 @@ int ZZ_ATPControl_Serial_Qt::RecvData(QByteArray &qbData) if ((ZZ_U8)qbData[0] != (ZZ_U8)0xaa || (ZZ_U8)qbData[1] != (ZZ_U8)0x55) { qDebug() << "Err:RecvData Failed,Wrong Header.Exit Code:2" << qbData.size(); + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 2; } @@ -386,6 +416,7 @@ int ZZ_ATPControl_Serial_Qt::RecvData(QByteArray &qbData) if (iCounter > 200) { qDebug() << "Err:RecvData Failed,Incomplete Data.Exit Code:3" << qbData.size(); + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 3; } iCounter++; @@ -406,6 +437,7 @@ int ZZ_ATPControl_Serial_Qt::RecvData(QByteArray &qbData) if ((ZZ_U8)usCheckSum != ucTemp) { qDebug() << "Err:RecvData Failed,Incorrect Check Sum.Exit Code:4" << "Total Recv:" << qbData.size() << "Check Sum:" << usCheckSum << "Not Equal To" << ucTemp; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; //qbData.clear(); //return 4; return 0; @@ -429,6 +461,7 @@ int ZZ_ATPControl_Serial_Qt::RecvData_ShortLag(QByteArray &qbData) if (iCounter > 6) { qDebug() << "Err:RecvData_ShortLag Failed,Not Enough Data.Exit Code:1" << qbData.size(); + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } iCounter++; @@ -437,6 +470,7 @@ int ZZ_ATPControl_Serial_Qt::RecvData_ShortLag(QByteArray &qbData) if ((ZZ_U8)qbData[0] != (ZZ_U8)0xaa || (ZZ_U8)qbData[1] != (ZZ_U8)0x55) { qDebug() << "Err:RecvData_ShortLag Failed,Wrong Header.Exit Code:2" << qbData.size(); + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 2; } @@ -450,6 +484,7 @@ int ZZ_ATPControl_Serial_Qt::RecvData_ShortLag(QByteArray &qbData) if (iCounter > 6) { qDebug() << "Err:RecvData_ShortLag Failed,Incomplete Data.Exit Code:3" << qbData.size(); + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 3; } iCounter++; @@ -470,6 +505,7 @@ int ZZ_ATPControl_Serial_Qt::RecvData_ShortLag(QByteArray &qbData) if ((ZZ_U8)usCheckSum != ucTemp) { qDebug() << "Err:RecvData_ShortLag Failed,Incorrect Check Sum.Exit Code:4" << "Total Recv:" << qbData.size() << "Check Sum:" << usCheckSum << "Not Equal To" << ucTemp; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; //qbData.clear(); //return 4; return 0; @@ -483,6 +519,7 @@ int ZZ_ATPControl_Serial_Qt::ParseData(QByteArray &qbData) if (qbData.size() < 6) { qDebug() << "Err:ParseData Failed,Not Enough Data.Exit Code:1" << qbData.size(); + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } qbData.remove(0, 5); @@ -519,6 +556,7 @@ int ZZ_ATPControl_Serial_Qt::PerformAutoExposure(float fMinScaleFactor, float fM if (iRes != 0) { qDebug() << "Err:PerformAutoExposure Failed.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } @@ -544,6 +582,7 @@ int ZZ_ATPControl_Serial_Qt::PerformAutoExposure(float fMinScaleFactor, float fM if (iRes != 0) { qDebug() << "Err:PerformAutoExposure Failed.Exit Code:2"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 2; } @@ -620,6 +659,7 @@ int ZZ_ATPControl_Serial_Qt::PerformAutoExposure(float fMinScaleFactor, float fM if (iRes != 0) { qDebug() << "Err:PerformAutoExposure Failed.Exit Code:3"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 3; } bFlagIsOverMaxExposureTime = true; @@ -630,6 +670,7 @@ int ZZ_ATPControl_Serial_Qt::PerformAutoExposure(float fMinScaleFactor, float fM if (iRes != 0) { qDebug() << "Err:PerformAutoExposure Failed.Exit Code:4"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 3; } } @@ -660,24 +701,28 @@ int ZZ_ATPControl_Serial_Qt::SetExposureTime(int iExposureTimeInMS) if (iRes != 0) { qDebug() << "Err:SetExposureTime Failed.Exit Code:2"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 2; } iRes = RecvData(qbRecv); if (iRes != 0) { qDebug() << "Err:SetExposureTime Failed.Exit Code:3"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 3; } iRes = ParseData(qbRecv); if (iRes != 0) { qDebug() << "Err:SetExposureTime Failed.Exit Code:4"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 4; } if ((ZZ_U8)qbRecv[0] != 0) { qDebug() << "Err:SetExposureTime Failed.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; /*m_pSerialPort->waitForReadyRead(5000); m_pSerialPort->clear();*/ //return 1; @@ -735,18 +780,21 @@ int ZZ_ATPControl_Serial_Qt::SingleShot(DataFrame &dfData) if (iRes != 0) { qDebug() << "Err:SingleShot Failed.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } iRes = RecvData(qbRecv); if (iRes != 0) { qDebug() << "Err:SingleShot Failed.Exit Code:2"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 2; } iRes = ParseData(qbRecv); if (iRes != 0) { qDebug() << "Err:SingleShot Failed.Exit Code:3"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 3; } @@ -755,6 +803,7 @@ int ZZ_ATPControl_Serial_Qt::SingleShot(DataFrame &dfData) if ((ZZ_U8)qbRecv[0] != 0) { qDebug() << "Err:SingleShot Failed.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } else @@ -794,24 +843,28 @@ int ZZ_ATPControl_Serial_Qt::SingleShot(int &iPixels) if (iRes != 0) { qDebug() << "Err:SingleShotP Failed.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } iRes = RecvData(qbRecv); if (iRes != 0) { qDebug() << "Err:SingleShotP Failed.Exit Code:2"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 2; } iRes = ParseData(qbRecv); if (iRes != 0) { qDebug() << "Err:SingleShot Failed.Exit Code:3"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 3; } if ((ZZ_U8)qbRecv[0] != 0) { qDebug() << "Err:SingleShotP Failed.Exit Code:4"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 4; } else @@ -844,18 +897,21 @@ int ZZ_ATPControl_Serial_Qt::GetDeviceTemperature(float &fTemperature) if (iRes != 0) { qDebug() << "Err:GetDeviceTemperature Failed.Exit Code:1"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 1; } iRes = RecvData_ShortLag(qbRecv); if (iRes != 0) { qDebug() << "Err:GetDeviceTemperature Failed.Exit Code:2"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 2; } iRes = ParseData(qbRecv); if (iRes != 0) { qDebug() << "Err:GetDeviceTemperature Failed.Exit Code:3"; + qDebug() << "FS Init Port:" << qstrInitPortName << "FS Init Dev SN :" << qstrInitDeviceSN; return 3; } diff --git a/source/FS/ATPControl_Serial_QT.h b/source/FS/ATPControl_Serial_QT.h index c6d91c8..32a7a15 100644 --- a/source/FS/ATPControl_Serial_QT.h +++ b/source/FS/ATPControl_Serial_QT.h @@ -70,6 +70,8 @@ public: #else // private: #endif + //init + QString qstrInitPortName,qstrInitDeviceSN; //port int m_iBaudRate; QSerialPort *m_pSerialPort;