Change #458

Changed by	chenjing
Changed at	Mon 09 Oct 2017 13:33:03
Repository	http://192.168.123.218:8888/svn/BH5000/DAQ/trunk
Project	DAQ
Revision	12983

Comments

[MRG] 合并新无线分支到主干

Changed files

DAQ.sln
bin/Debug/BHResMgrD.dll
bin/Debug/GraphCtrld.dll
bin/Release/BHResMgr.dll
bin/Release/GraphCtrl.dll
inc/Panel.h
inc/Trend.h
lib/Debug/GraphCtrld.lib
lib/Release/GraphCtrl.lib
src/NewModbusWireless
src/NewModbusWireless/BHPackage.h
src/NewModbusWireless/ChannelStatus.cpp
src/NewModbusWireless/ChannelStatus.h
src/NewModbusWireless/DlgChannelSet.cpp
src/NewModbusWireless/DlgChannelSet.h
src/NewModbusWireless/DlgChannelStatus.cpp
src/NewModbusWireless/DlgChannelStatus.h
src/NewModbusWireless/DlgMeasPointData.cpp
src/NewModbusWireless/DlgMeasPointData.h
src/NewModbusWireless/DlgMiddleWareSet.cpp
src/NewModbusWireless/DlgMiddleWareSet.h
src/NewModbusWireless/DlgSynConfigInfo.cpp
src/NewModbusWireless/DlgSynConfigInfo.h
src/NewModbusWireless/DlgSynPlant.cpp
src/NewModbusWireless/DlgSynPlant.h
src/NewModbusWireless/DlgWaveSpectrum.cpp
src/NewModbusWireless/DlgWaveSpectrum.h
src/NewModbusWireless/DlgWirelessGateWaySet.cpp
src/NewModbusWireless/DlgWirelessGateWaySet.h
src/NewModbusWireless/DlgWirelessSensorSet.cpp
src/NewModbusWireless/DlgWirelessSensorSet.h
src/NewModbusWireless/FixCommWrapper.h
src/NewModbusWireless/LogPool.cpp
src/NewModbusWireless/LogPool.h
src/NewModbusWireless/MeasPointData.cpp
src/NewModbusWireless/MeasPointData.h
src/NewModbusWireless/MeasPointDataMgr.cpp
src/NewModbusWireless/MeasPointDataMgr.h
src/NewModbusWireless/MfcExtend.cpp
src/NewModbusWireless/MfcExtend.h
src/NewModbusWireless/ModbusDefine.h
src/NewModbusWireless/ModbusFrameGen.cpp
src/NewModbusWireless/ModbusFrameGen.h
src/NewModbusWireless/ModbusFrameParser.cpp
src/NewModbusWireless/ModbusFrameParser.h
src/NewModbusWireless/ModbusRTUFrameGen.cpp
src/NewModbusWireless/ModbusRTUFrameGen.h
src/NewModbusWireless/ModbusRtuFrameParser.cpp
src/NewModbusWireless/ModbusRtuFrameParser.h
src/NewModbusWireless/ModbusTCPFrameGen.cpp
src/NewModbusWireless/ModbusTCPFrameGen.h
src/NewModbusWireless/ModbusTcpFrameParser.cpp
src/NewModbusWireless/ModbusTcpFrameParser.h
src/NewModbusWireless/ModbusWireless.cpp
src/NewModbusWireless/ModbusWireless.h
src/NewModbusWireless/ModbusWireless.rc
src/NewModbusWireless/ModbusWirelessDataSendThread.cpp
src/NewModbusWireless/ModbusWirelessDataSendThread.h
src/NewModbusWireless/ModbusWirelessDlg.cpp
src/NewModbusWireless/ModbusWirelessDlg.h
src/NewModbusWireless/ModbusWirelessJson.cpp
src/NewModbusWireless/ModbusWirelessJson.h
src/NewModbusWireless/ModbusWirelessParam.cpp
src/NewModbusWireless/ModbusWirelessParam.h
src/NewModbusWireless/NewModbusWireless.sln
src/NewModbusWireless/NewModbusWireless.vcproj
src/NewModbusWireless/ReadMe.txt
src/NewModbusWireless/SendDataPack.h
src/NewModbusWireless/SendIndexHelper.cpp
src/NewModbusWireless/SendIndexHelper.h
src/NewModbusWireless/SynComm.cpp
src/NewModbusWireless/SynComm.h
src/NewModbusWireless/TabCtrlEx.cpp
src/NewModbusWireless/TabCtrlEx.h
src/NewModbusWireless/ThreadModbusDaq.cpp
src/NewModbusWireless/ThreadModbusDaq.h
src/NewModbusWireless/WirelessGateway.cpp
src/NewModbusWireless/WirelessGateway.h
src/NewModbusWireless/WirelessMeasPoint.cpp
src/NewModbusWireless/WirelessMeasPoint.h
src/NewModbusWireless/WirelessPlant.cpp
src/NewModbusWireless/WirelessPlant.h
src/NewModbusWireless/WirelessSensor.cpp
src/NewModbusWireless/WirelessSensor.h
src/NewModbusWireless/WirelessSubSensor.cpp
src/NewModbusWireless/WirelessSubSensor.h
src/NewModbusWireless/res
src/NewModbusWireless/res/ModbusWireless.ico
src/NewModbusWireless/res/ModbusWireless.manifest
src/NewModbusWireless/res/ModbusWireless.rc2
src/NewModbusWireless/resource.h
src/NewModbusWireless/stdafx.cpp
src/NewModbusWireless/stdafx.h