Change #279

Changed by	chenyadong
Changed at	Mon 09 Sep 2019 16:49:06
Repository	http://192.168.123.218:8888/svn/BH5000/DAQ/branches/4.8.x
Project	DAQ
Revision	13650

Comments

Merged revision(s) 1082,1083 from /DAQ[无线网关]_cyd:
r1083
*CHG*将一些配置写入文件，运行时读取
---------------------
r1082
*CHG*替换zoom_analysis算法库文件
---------------------

Changed files

bin/Debug/BHZoomAnalysis.dll
bin/Debug/reference.bin
bin/Release/BHZoomAnalysis.dll
bin/Release/reference.bin
inc/BHZoomAnalysis.h
lib/Debug/BHZoomAnalysis.lib
lib/Release/BHZoomAnalysis.lib
src/NewModbusWireless/DlgSynConfigInfo.cpp
src/NewModbusWireless/DlgWirelessGateWaySet.cpp
src/NewModbusWireless/ModbusDefine.h
src/NewModbusWireless/ModbusWirelessJson.cpp
src/NewModbusWireless/ModbusWirelessParam.h
src/NewModbusWireless/ThreadModbusDaq.cpp
src/NewModbusWireless/WirelessGateway.cpp
src/NewModbusWireless/WirelessSubSensor.cpp
src/NewModbusWireless/WirelessSubSensor.h