Merge remote-tracking branch 'origin/zhangzhuo'

This commit is contained in:
xin
2022-03-01 10:59:17 +08:00
4 changed files with 28 additions and 19 deletions

View File

@ -731,11 +731,9 @@ int ZZ_ATPControl_Serial_Qt::SingleShot(DataFrame &dfData)
// dfData.lData[i] = usData[i];
// }
}
float fTemp;
GetDeviceTemperature(fTemp);
dfData.usExposureTimeInMS = m_iExposureTime;
dfData.fTemperature = fTemp;
return 0;