xin/TowerOptoSifAndSpectral
1
0
Fork 0
mirror of http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git synced 2025-10-19 19:49:42 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
xin
2024-08-21 10:05:23 +08:00
parent a7a2e559ef ad0c4149e6
commit c6faf2d8d4
6 changed files with 58 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeSettings.json
View File

@ -3,14 +3,14 @@
{ {
"name": "Linux-GCC-Debug", "name": "Linux-GCC-Debug",
"generator": "Unix Makefiles", "generator": "Unix Makefiles",
"configurationType": "Debug", "configurationType": "Release",
"cmakeExecutable": "/opt/cmake/bin/cmake", "cmakeExecutable": "/opt/cmake/bin/cmake",
"remoteCopySourcesExclusionList": [ ".vs", ".git", "out" ], "remoteCopySourcesExclusionList": [ ".vs", ".git", "out" ],
"buildCommandArgs": "", "buildCommandArgs": "",
"ctestCommandArgs": "", "ctestCommandArgs": "",
"inheritEnvironments": [ "linux_arm" ], "inheritEnvironments": [ "linux_arm" ],
"intelliSenseMode": "linux-gcc-x64", "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", "remoteCMakeListsRoot": "/home/pi/SIF0/src",
"remoteBuildRoot": "/home/pi/SIF0/out/build_d/${name}", "remoteBuildRoot": "/home/pi/SIF0/out/build_d/${name}",
"remoteInstallRoot": "/home/pi/SIF0/out/install/${name}", "remoteInstallRoot": "/home/pi/SIF0/out/install/${name}",
@ -29,6 +29,25 @@
"buildCommandArgs": "", "buildCommandArgs": "",
"ctestCommandArgs": "", "ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_x64_x64" ] "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"
} }
] ]
} }

30
main.cpp
View File

@ -9,7 +9,6 @@
#include "MainDataUploader.h" #include "MainDataUploader.h"
#include "VSMD12XMovementTest.h" #include "VSMD12XMovementTest.h"
using namespace std; using namespace std;
#pragma once
int main(int argc, char *argv[]) int main(int argc, char *argv[])
@ -20,7 +19,7 @@ int main(int argc, char *argv[])
QCoreApplication a(argc, argv); QCoreApplication a(argc, argv);
//////////////////////////////////////////////////////////////////////////for test //////////////////////////////////////////////////////////////////////////for test
MovementTest m_testVSMD12X; //MovementTest m_testVSMD12X;
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
//system("gpio mode 1 output");//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ų<EFBFBD>ʼ<EFBFBD><CABC> //system("gpio mode 1 output");//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ų<EFBFBD>ʼ<EFBFBD><CABC>
//qDebug() << "gpio mode 1 output......" << endl; //qDebug() << "gpio mode 1 output......" << endl;
@ -54,13 +53,14 @@ int main(int argc, char *argv[])
///turn on power supply ///turn on power supply
//////add support to dual channel //////add support to dual channel
system("gpio mode 1 out"); int iRet0 = 0,iRet1 = 0,iRet2 = 0,iRet3 = 0;
system("gpio mode 4 out"); iRet0 = system("gpio mode 1 out");
system("gpio mode 5 out"); iRet1 = system("gpio mode 4 out");
qDebug() << "gpio 1;4;5; ready" << endl; iRet2 = system("gpio mode 5 out");
iRet3 = system("gpio write 1 1");//上电
system("gpio write 1 1");//<2F>豸<EFBFBD>ϵ<EFBFBD> qDebug() << "gpio 1;4;5; ready"<<" Ret:"<< iRet0<< iRet1<< iRet2<< endl;
qDebug() << "gpio write 1 1......" << endl; qDebug() << "gpio write 1 1......" <<" Ret:"<< iRet3<< endl;
// QString qstrCMD_A, qstrCMD_B, qstrCMD_Temp; // QString qstrCMD_A, qstrCMD_B, qstrCMD_Temp;
// qstrCMD_Temp = QString::fromStdString("4"); // 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_scConfiggerLoader.GetParams(m_struRuntimeParams, m_struEC, m_struMEC, m_struHumitureDI);
m_sTimer.SetAcqTimeParams(m_struRuntimeParams.atsParams); 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_mduUploader.Initialize();
m_ctrlHumitureDetector.Initialize(m_struHumitureDI.qstrInterfaceName.toStdString()); m_ctrlHumitureDetector.Initialize(m_struHumitureDI.qstrInterfaceName.toStdString());
//////////////////////////////////////////////////////////////////////////prepare //////////////////////////////////////////////////////////////////////////prepare
m_sTimer.Preheating(); m_sTimer.Preheating();
m_ctrlHumitureDetector.GetHumiture_retry(m_fChassisTemp, m_fChassisHum); 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.qstrCaseTemperature= QString("%1").arg(m_fChassisTemp);
m_struEC.qstrCaseHumidity = QString("%1").arg(m_fChassisHum); 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_pqDataGrabberThreadHolder = new QThread();
QThread* m_pqTimerThreadHolder = new QThread(); QThread* m_pqTimerThreadHolder = new QThread();
@ -123,9 +126,6 @@ int main(int argc, char *argv[])
m_mdgGrabber.Init_Self(); m_mdgGrabber.Init_Self();
m_sTimer.SelfStart(); m_sTimer.SelfStart();
//////////////////////////////////////////////////////////////////////////test //////////////////////////////////////////////////////////////////////////test
// DataFileProcessor testdp; // DataFileProcessor testdp;
// ZZ_SysConfigger test; // 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.fWaveLength, sizeof(double)*OneFile.iPixels);
// qfCalFile.read((char*)OneFile.dCal_Gain, sizeof(double)*OneFile.iPixels); // qfCalFile.read((char*)OneFile.dCal_Gain, sizeof(double)*OneFile.iPixels);
// qfCalFile.read((char*)OneFile.dCal_Offset, sizeof(double)*OneFile.iPixels); // qfCalFile.read((char*)OneFile.dCal_Offset, sizeof(double)*OneFile.iPixels);
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
return a.exec(); return a.exec();

6
source/CaptureThread/MainDataGrabber.cpp
View File

@ -504,7 +504,7 @@ int CMainDataGrabber::GrabOnceFinished()
{ {
if (m_struLinearShutterContext.ucProtocolType == 100) if (m_struLinearShutterContext.ucProtocolType == 100)
{ {
if (i==0) if (/*i==0*/i%2==0)
{ {
qstrCMD_Temp = QString::fromStdString(m_vecDSS[0].strChannelA); qstrCMD_Temp = QString::fromStdString(m_vecDSS[0].strChannelA);
qstrCMD_A = "gpio write " + qstrCMD_Temp + " 1"; qstrCMD_A = "gpio write " + qstrCMD_Temp + " 1";
@ -520,7 +520,7 @@ int CMainDataGrabber::GrabOnceFinished()
Delay_MSec(500); Delay_MSec(500);
} }
if (i==1) else if (/*i==1*/i%2==1)
{ {
qstrCMD_Temp = QString::fromStdString(m_vecDSS[0].strChannelA); qstrCMD_Temp = QString::fromStdString(m_vecDSS[0].strChannelA);
qstrCMD_A = "gpio write " + qstrCMD_Temp + " 0"; qstrCMD_A = "gpio write " + qstrCMD_Temp + " 0";
@ -634,6 +634,8 @@ int CMainDataGrabber::GrabOnceFinished()
m_pmduUploader->SetData(vecData); m_pmduUploader->SetData(vecData);
emit SignalPushOneDataFrame(); emit SignalPushOneDataFrame();
m_pdfpSaver->SetData(vecData); m_pdfpSaver->SetData(vecData);
qDebug() << "Thread Data Server: WriteDataFile Called";
m_pdfpSaver->WriteDataFile(); m_pdfpSaver->WriteDataFile();
m_iFlagIsCapturing = 0; m_iFlagIsCapturing = 0;

1
source/CaptureThread/Scheduler.cpp
View File

@ -25,6 +25,7 @@ void Scheduler::SetAcqTimeParams(AcqTimeSettings struAcqTime)
void Scheduler::Preheating() void Scheduler::Preheating()
{ {
qDebug() << "Start Preheating"; qDebug() << "Start Preheating";
//QThread::msleep(5000);
#ifdef _DEBUG #ifdef _DEBUG
QThread::msleep(5000); QThread::msleep(5000);
#else #else

7
source/FS/DataFileProcessor.cpp
View File

@ -37,9 +37,16 @@ void DataFileProcessor::SetData(std::vector<std::vector<DataFrame>> vecData)
bool DataFileProcessor::WriteDataFile() bool DataFileProcessor::WriteDataFile()
{ {
//qDebug() << "start Thread Data Server GenerateFilePath";
GenerateFilePath(); GenerateFilePath();
//qDebug() << "start Thread Data Server WriteEnvironmentInfo";
WriteEnvironmentInfo(); WriteEnvironmentInfo();
//qDebug() << "start Thread Data Server WriteDeviceInfo";
WriteDeviceInfo(); WriteDeviceInfo();
//qDebug() << "start Thread Data Server WriteData";
WriteData(); WriteData();
return 1; return 1;
} }

16
source/LinearShutter/VSMD12XControl.cpp
View File

@ -222,7 +222,7 @@ bool CVSMD12XControl::InitController()
bool CVSMD12XControl::GetStatus(MSInfo &stuMotorParam) bool CVSMD12XControl::GetStatus(MSInfo &stuMotorParam)
{ {
std::string strCMD = "cts\n"; std::string strCMD = "sts\n";
if (m_iProtocolType) if (m_iProtocolType)
{ {
@ -1432,7 +1432,7 @@ bool CVSMD12XControl::IsMotionFinished()
QThread::msleep(200); QThread::msleep(200);
//Delay_MSec(200); //Delay_MSec(200);
GetStatus(m_stuMSInfo); GetStatus(m_stuMSInfo);
ZZ_U8 ucFlag = m_stuMSInfo.uiFlags & 0x000000FF; ZZ_U8 ucFlag = m_stuMSInfo.uiFlags & 0x00FFFFFF;
ucFlag = ucFlag & 0x10; ucFlag = ucFlag & 0x10;
if (m_stuMSInfo.fVelocity == 0) if (m_stuMSInfo.fVelocity == 0)
{ {
@ -1445,15 +1445,21 @@ bool CVSMD12XControl::IsMotionFinished()
} }
if (iCountStopped>=50) 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() <<"Warning.Motion Err,should be stopped already.checking register and retry...";
qDebug() <<"motion status:"<<ucFlag<<"all status:"<<QString::number(m_stuMSInfo.uiFlags,2); qDebug() << "velocity:" << m_stuMSInfo.fVelocity;
qDebug() << "position:" << m_stuMSInfo.iPosition;
qDebug() << "motion status:" << ucFlag << "all status:" << str;
bFlagIsStopped = true; bFlagIsStopped = true;
return false; return false;
} }
if (iCountTotal>1000) if (iCountTotal>1000)
{ {
qDebug() << "Err.Motor Hardware Err,should be stopped already"; QString str = QString("%1").arg(m_stuMSInfo.uiFlags, 30, 2, QChar('0'));
qDebug() << "motion status:" << ucFlag << "all status:" << QString::number(m_stuMSInfo.uiFlags, 2); 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; bFlagIsStopped = true;
return false; return false;
} }