Change #275

Changed by	chenyadong
Changed at	Mon 02 Sep 2019 16:28:05
Repository	http://192.168.123.218:8888/svn/BH5000/DAQ/branches/4.8.x
Project	DAQ
Revision	13646

Comments

Merged revision(s) 1074-1078 from /DAQ[无线网关]_cyd:
r1078
*CHG*添加遗漏的数据
---------------------
r1077
*CHG*添加上拷贝缓存数据遗漏的波形数据状态以及当传输和采集同时发生时，进行采集
---------------------
r1075
*BUG*只有当全部节点采集波形时才缓存波形数据 *CHG*波形处理放到更新数据更新处
---------------------
r1074
*BUG*通道特征值变化超过20%关联到设备 优先判断特征值变化再判断特征值采集次数 采集特征值次数统计放到只采集特征值的时候
---------------------

Changed files

src/NewModbusWireless/DlgWirelessGateWaySet.cpp
src/NewModbusWireless/ModbusDefine.h
src/NewModbusWireless/ModbusWirelessDataSendThread.cpp
src/NewModbusWireless/ModbusWirelessDataSendThread.h
src/NewModbusWireless/ModbusWirelessDlg.cpp
src/NewModbusWireless/ModbusWirelessJson.cpp
src/NewModbusWireless/ModbusWirelessParam.cpp
src/NewModbusWireless/ModbusWirelessParam.h
src/NewModbusWireless/ThreadModbusDaq.cpp
src/NewModbusWireless/ThreadModbusDaq.h