diff --git a/CMakeSettings.json b/CMakeSettings.json index 398f788..95624be 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -3,14 +3,14 @@ { "name": "Linux-GCC-Debug", "generator": "Unix Makefiles", - "configurationType": "Debug", + "configurationType": "Release", "cmakeExecutable": "/opt/cmake/bin/cmake", "remoteCopySourcesExclusionList": [ ".vs", ".git", "out" ], "buildCommandArgs": "", "ctestCommandArgs": "", "inheritEnvironments": [ "linux_arm" ], "intelliSenseMode": "linux-gcc-x64", - "remoteMachineName": "243120617;172.16.0.232 (username=root, port=22, authentication=Password)", + "remoteMachineName": "437198504;172.16.0.96 (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}", @@ -29,6 +29,25 @@ "buildCommandArgs": "", "ctestCommandArgs": "", "inheritEnvironments": [ "msvc_x64_x64" ] + }, + { + "name": "Linux-GCC-R", + "generator": "Unix Makefiles", + "configurationType": "Release", + "cmakeExecutable": "/opt/cmake/bin/cmake", + "remoteCopySourcesExclusionList": [ ".vs", ".git", "out" ], + "buildCommandArgs": "", + "ctestCommandArgs": "", + "inheritEnvironments": [ "linux_arm" ], + "intelliSenseMode": "linux-gcc-x64", + "remoteMachineName": "-1784524891;172.16.0.71 (username=root, port=22, authentication=Password)", + "remoteCMakeListsRoot": "/home/pi/SIF0/src_r", + "remoteBuildRoot": "/home/pi/SIF0/out/build_r/${name}", + "remoteInstallRoot": "/home/pi/SIF0/out/install_r/${name}", + "remoteCopySources": true, + "rsyncCommandArgs": "-t --delete --delete-excluded", + "remoteCopyBuildOutput": true, + "remoteCopySourcesMethod": "rsync" } ] } \ No newline at end of file diff --git a/main.cpp b/main.cpp index feba0c7..226dee1 100644 --- a/main.cpp +++ b/main.cpp @@ -9,7 +9,6 @@ #include "MainDataUploader.h" #include "VSMD12XMovementTest.h" using namespace std; -#pragma once int main(int argc, char *argv[]) @@ -20,7 +19,7 @@ int main(int argc, char *argv[]) QCoreApplication a(argc, argv); //////////////////////////////////////////////////////////////////////////for test - MovementTest m_testVSMD12X; + //MovementTest m_testVSMD12X; //////////////////////////////////////////////////////////////////////////// //system("gpio mode 1 output");//������ų�ʼ�� //qDebug() << "gpio mode 1 output......" << endl; @@ -54,13 +53,14 @@ int main(int argc, char *argv[]) ///turn on power supply //////add support to dual channel - system("gpio mode 1 out"); - system("gpio mode 4 out"); - system("gpio mode 5 out"); - qDebug() << "gpio 1;4;5; ready" << endl; + int iRet0 = 0,iRet1 = 0,iRet2 = 0,iRet3 = 0; + iRet0 = system("gpio mode 1 out"); + iRet1 = system("gpio mode 4 out"); + iRet2 = system("gpio mode 5 out"); + iRet3 = system("gpio write 1 1");//上电 - system("gpio write 1 1");//�豸�ϵ� - qDebug() << "gpio write 1 1......" << endl; + qDebug() << "gpio 1;4;5; ready"<<" Ret:"<< iRet0<< iRet1<< iRet2<< endl; + qDebug() << "gpio write 1 1......" <<" Ret:"<< iRet3<< endl; // QString qstrCMD_A, qstrCMD_B, qstrCMD_Temp; // qstrCMD_Temp = QString::fromStdString("4"); @@ -86,18 +86,21 @@ int main(int argc, char *argv[]) m_scConfiggerLoader.GetParams(m_struRuntimeParams, m_struEC, m_struMEC, m_struHumitureDI); m_sTimer.SetAcqTimeParams(m_struRuntimeParams.atsParams); - m_dfpSaver.SetEnvironmentContex(m_struEC); - m_dfpSaver.SetManmadeEnviromentalContext(m_struMEC); - m_mduUploader.SetContext(m_struEC, m_struMEC); + //m_mduUploader.SetContext(m_struEC, m_struMEC); //m_mduUploader.Initialize(); m_ctrlHumitureDetector.Initialize(m_struHumitureDI.qstrInterfaceName.toStdString()); //////////////////////////////////////////////////////////////////////////prepare 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); + + m_dfpSaver.SetEnvironmentContex(m_struEC); + m_dfpSaver.SetManmadeEnviromentalContext(m_struMEC); + m_mduUploader.SetContext(m_struEC, m_struMEC); ////////////////////////////////////////////////////////////////////////// QThread* m_pqDataGrabberThreadHolder = new QThread(); QThread* m_pqTimerThreadHolder = new QThread(); @@ -123,9 +126,6 @@ int main(int argc, char *argv[]) m_mdgGrabber.Init_Self(); m_sTimer.SelfStart(); - - - //////////////////////////////////////////////////////////////////////////test // DataFileProcessor testdp; // ZZ_SysConfigger test; @@ -210,8 +210,6 @@ int main(int argc, char *argv[]) // 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(); diff --git a/source/CaptureThread/MainDataGrabber.cpp b/source/CaptureThread/MainDataGrabber.cpp index a65f71c..f451e66 100644 --- a/source/CaptureThread/MainDataGrabber.cpp +++ b/source/CaptureThread/MainDataGrabber.cpp @@ -504,7 +504,7 @@ int CMainDataGrabber::GrabOnceFinished() { if (m_struLinearShutterContext.ucProtocolType == 100) { - if (i==0) + if (/*i==0*/i%2==0) { qstrCMD_Temp = QString::fromStdString(m_vecDSS[0].strChannelA); qstrCMD_A = "gpio write " + qstrCMD_Temp + " 1"; @@ -520,7 +520,7 @@ int CMainDataGrabber::GrabOnceFinished() Delay_MSec(500); } - if (i==1) + else if (/*i==1*/i%2==1) { qstrCMD_Temp = QString::fromStdString(m_vecDSS[0].strChannelA); qstrCMD_A = "gpio write " + qstrCMD_Temp + " 0"; @@ -634,6 +634,8 @@ int CMainDataGrabber::GrabOnceFinished() m_pmduUploader->SetData(vecData); emit SignalPushOneDataFrame(); m_pdfpSaver->SetData(vecData); + + qDebug() << "Thread Data Server: WriteDataFile Called"; m_pdfpSaver->WriteDataFile(); m_iFlagIsCapturing = 0; diff --git a/source/CaptureThread/Scheduler.cpp b/source/CaptureThread/Scheduler.cpp index 668e52b..41e17a7 100644 --- a/source/CaptureThread/Scheduler.cpp +++ b/source/CaptureThread/Scheduler.cpp @@ -25,6 +25,7 @@ void Scheduler::SetAcqTimeParams(AcqTimeSettings struAcqTime) void Scheduler::Preheating() { qDebug() << "Start Preheating"; + //QThread::msleep(5000); #ifdef _DEBUG QThread::msleep(5000); #else diff --git a/source/FS/DataFileProcessor.cpp b/source/FS/DataFileProcessor.cpp index f635483..b759bcb 100644 --- a/source/FS/DataFileProcessor.cpp +++ b/source/FS/DataFileProcessor.cpp @@ -37,9 +37,16 @@ void DataFileProcessor::SetData(std::vector> vecData) bool DataFileProcessor::WriteDataFile() { + //qDebug() << "start Thread Data Server GenerateFilePath"; GenerateFilePath(); + + //qDebug() << "start Thread Data Server WriteEnvironmentInfo"; WriteEnvironmentInfo(); + + //qDebug() << "start Thread Data Server WriteDeviceInfo"; WriteDeviceInfo(); + + //qDebug() << "start Thread Data Server WriteData"; WriteData(); return 1; } diff --git a/source/LinearShutter/VSMD12XControl.cpp b/source/LinearShutter/VSMD12XControl.cpp index 9b6f1ea..b53f9f7 100644 --- a/source/LinearShutter/VSMD12XControl.cpp +++ b/source/LinearShutter/VSMD12XControl.cpp @@ -222,7 +222,7 @@ bool CVSMD12XControl::InitController() bool CVSMD12XControl::GetStatus(MSInfo &stuMotorParam) { - std::string strCMD = "cts\n"; + std::string strCMD = "sts\n"; if (m_iProtocolType) { @@ -1432,7 +1432,7 @@ bool CVSMD12XControl::IsMotionFinished() QThread::msleep(200); //Delay_MSec(200); GetStatus(m_stuMSInfo); - ZZ_U8 ucFlag = m_stuMSInfo.uiFlags & 0x000000FF; + ZZ_U8 ucFlag = m_stuMSInfo.uiFlags & 0x00FFFFFF; ucFlag = ucFlag & 0x10; if (m_stuMSInfo.fVelocity == 0) { @@ -1445,15 +1445,21 @@ bool CVSMD12XControl::IsMotionFinished() } if (iCountStopped>=50) { + QString str = QString("%1").arg(m_stuMSInfo.uiFlags, 30, 2, QChar('0')); qDebug() <<"Warning.Motion Err,should be stopped already.checking register and retry..."; - qDebug() <<"motion status:"<1000) { - qDebug() << "Err.Motor Hardware Err,should be stopped already"; - qDebug() << "motion status:" << ucFlag << "all status:" << QString::number(m_stuMSInfo.uiFlags, 2); + QString str = QString("%1").arg(m_stuMSInfo.uiFlags, 30, 2, QChar('0')); + qDebug() << "Warning.Motion Err,should be stopped already.checking register and retry..."; + qDebug() << "velocity:" << m_stuMSInfo.fVelocity; + qDebug() << "position:" << m_stuMSInfo.iPosition; + qDebug() << "motion status:" << ucFlag << "all status:" << str; bFlagIsStopped = true; return false; }