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

Merge remote-tracking branch 'origin/zhangzhuo'

Browse Source 
# Conflicts:
#	source/CaptureThread/Scheduler.cpp
This commit is contained in:
xin
2022-03-21 16:46:12 +08:00
parent 02eded270d 00ef87ab2a
commit 5e0402a424
5 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/FS/OControl_USB.cpp
View File

@ -465,7 +465,7 @@ int OceanOptics_lib::GetDeviceAttribute(DeviceAttribute &Attr)
long minimum_time;
minimum_time = seabreeze_get_min_integration_time_microsec(m_iSpectralmeterHandle, &error);
Attr.iMinIntegrationTimeInMS = minimum_time;
Attr.iMinIntegrationTimeInMS = (int)((double)minimum_time / (double)1000);
Attr.iMaxIntegrationTimeInMS = 60000;
if (spec_length > 0) {