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/zhangzhuo'

Browse Source
This commit is contained in:
任立新
2022-02-18 17:22:36 +08:00
parent 8ddbd93020 200fda19dc
commit 2b9de45d6a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main.cpp
View File

@ -87,10 +87,10 @@ int main(int argc, char *argv[])
m_mdgGrabber.SetContext(m_struRuntimeParams, m_dfpSaver, m_sTimer, m_mduUploader); m_mdgGrabber.SetContext(m_struRuntimeParams, m_dfpSaver, m_sTimer, m_mduUploader);
m_mdgGrabber.Init_Normal(); m_mdgGrabber.Init_Normal();
// m_mduUploader.Initialize(); m_mduUploader.Initialize();
// m_mduUploader.SetErr(m_eiErrInfo); m_mduUploader.SetErr(m_eiErrInfo);
// m_mduUploader.UploadInfo(); m_mduUploader.UploadInfo();
// m_mduUploader.UploadErr(); m_mduUploader.UploadErr();
m_pqDataGrabberThreadHolder->start(); m_pqDataGrabberThreadHolder->start();
m_pqTimerThreadHolder->start(); m_pqTimerThreadHolder->start();

2
source/CaptureThread/MainDataGrabber.cpp
View File

@ -284,7 +284,7 @@ int CMainDataGrabber::StartGrab()
void CMainDataGrabber::Init_Self() void CMainDataGrabber::Init_Self()
{ {
//emit SignalLSInit(); emit SignalLSInit();
return; return;
} }