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

在服务器上第一次调试

Browse Source
This commit is contained in:
任立新
2021-12-03 12:55:05 +08:00
parent 8d73aba000
commit bebef6bef6
24 changed files with 2040 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/FS/DataFileProcessor.cpp
View File

@ -5,7 +5,7 @@ DataFileProcessor::DataFileProcessor()
#ifdef _DEBUG
m_qstrFilePath = "E:/WorkSpace/TowerOptoSifAndSpectral/Data";
#else
m_qstrFilePath = /home/data/Data;
m_qstrFilePath = "/ home / data / Data";
#endif // DEBUG
}

BIN
source/FS/OControl_USB.h
View File

Binary file not shown.

2
source/LinearShutter/VSMD12XControl.cpp
View File

@ -2,7 +2,7 @@
#include "VSMD12XControl.h"
#include "ZZ_SeiralPort.h"
#include <iostream>
#define sprintf_s snprintf
CVSMD12XControl::CVSMD12XControl()
{
m_iProtocolType = 0;

4
source/LinearShutter/ZZ_SeiralPort.cpp
View File

@ -63,7 +63,7 @@ void CZZ_SeiralPort_QT::Close()
std::string CZZ_SeiralPort_QT::ReadAll()
{
m_pSerialPort->waitForReadyRead();
m_pSerialPort->waitForReadyRead(5000);
qbaRecv.clear();
qbaRecv = m_pSerialPort->readAll();
std::string strRet(qbaRecv.constData(), qbaRecv.length());
@ -99,7 +99,7 @@ int CZZ_SeiralPort_QT::Write(const std::string strSend)
{
QByteArray qbaTest(strSend.c_str(),(int)strSend.length());
qint64 qi64Write = m_pSerialPort->write(qbaTest);
m_pSerialPort->waitForBytesWritten();
m_pSerialPort->waitForBytesWritten(5000);
if (qi64Write != qbaTest.size())
{
qDebug() << "Err:write Failed.Exit Code:1" << qi64Write;

1
source/Settings/SystemConfigger.cpp
View File

@ -7,6 +7,7 @@
m_qstrDeviceConfigFilePath = "E:/WorkSpace/TowerOptoSifAndSpectral/config/DeviceSettings.ini";
m_qstrJSONConfigFilePath = "E:/WorkSpace/TowerOptoSifAndSpectral/config/config.json";
#else
m_qstrDeviceConfigFilePath = "/home/data/Setting/DeviceSettings.ini";
m_qstrJSONConfigFilePath = ("/home/data/Setting/config.json");
#endif // DEBUG