Change #232
| Changed by | chenyadong |
| Changed at | Thu 16 May 2019 09:49:10 |
| Repository | http://192.168.123.218:8888/svn/BH5000/DAQ/branches/4.8.x |
| Project | DAQ |
| Revision | 13567 |
Comments
Merged revision(s) 999, 1001-1002, 1017-1018 from 武汉无线改动: r1018: *CHG*添加遗漏的算法库文件 r1017: *CHG*添加ZoomAnalysis算法进行频谱扩展,传输数据结构体中添加采样率,方便传递计算后的采样率 r1002: *BUG*把之前每次发送后更新测点数据,然后写入文件的操作放到每次停止采集时进行 r1001: *BUG*暂时屏蔽数据更新时对配置文件的写入 r999: *BUG* 1,修改写入网关的传感器通道数对应实际情况; 2,修改超时逻辑中的读取到配置的超时时间乘以1000表示为毫秒
Changed files
- bin/Debug/BHZoomAnalysis.dll
- bin/Release/BHZoomAnalysis.dll
- inc/BHZoomAnalysis.h
- lib/Debug/BHZoomAnalysis.lib
- lib/Release/BHZoomAnalysis.lib
- src/NewModbusWireless/DlgWaveSpectrum.cpp
- src/NewModbusWireless/DlgWirelessGateWaySet.cpp
- src/NewModbusWireless/MeasPointData.cpp
- src/NewModbusWireless/MeasPointData.h
- src/NewModbusWireless/ModbusDefine.h
- src/NewModbusWireless/ModbusFrameGen.cpp
- src/NewModbusWireless/ModbusWirelessDataSendThread.cpp
- src/NewModbusWireless/ModbusWirelessDlg.cpp
- src/NewModbusWireless/NewModbusWireless.vcproj
- src/NewModbusWireless/ThreadModbusDaq.cpp