Change #652

Changed by	chenjing
Changed at	Wed 05 Jun 2019 11:34:16
Repository	http://192.168.123.218:8888/svn/BH5000/DAQ/trunk
Project	DAQ
Revision	13591

Comments

合并武汉分支改动：
[BUG] 合并柴油机分支后，非位移测点不再计算频谱
[BUG] 模拟器睡眠时间预估错误
[NEW] 添加modbus tcp功能（目前仅支持做主机）
[CHG] 合并采集性能优化（解决dell服务器丢包问题）

Changed files

bin/Debug/BHModbusComm.ini
bin/Debug/kddaq.json
bin/Release/BHModbusComm.ini
bin/Release/kddaq.json
inc/ACO/ACO.h
inc/ACO/ACOImpl.h
inc/ACO/SrvDef.h
inc/ACO/Util.h
inc/DSE_Define.h
inc/ICESERVER/ICE/Freeze/Freeze.h
inc/ICESERVER/ICE/Freeze/Index.h
inc/ICESERVER/ICE/Freeze/Initialize.h
inc/ICESERVER/ICE/Freeze/Map.h
inc/ICESERVER/ICE/Freeze/TransactionHolder.h
inc/ICESERVER/ICE/Glacier2/Glacier2.h
inc/ICESERVER/ICE/Ice/Application.h
inc/ICESERVER/ICE/Ice/BasicStream.h
inc/ICESERVER/ICE/Ice/Buffer.h
inc/ICESERVER/ICE/Ice/Config.h
inc/ICESERVER/ICE/Ice/ConnectionFactoryF.h
inc/ICESERVER/ICE/Ice/ConnectionIF.h
inc/ICESERVER/ICE/Ice/ConnectionMonitorF.h
inc/ICESERVER/ICE/Ice/Direct.h
inc/ICESERVER/ICE/Ice/DynamicLibrary.h
inc/ICESERVER/ICE/Ice/DynamicLibraryF.h
inc/ICESERVER/ICE/Ice/EndpointFactory.h
inc/ICESERVER/ICE/Ice/EndpointFactoryF.h
inc/ICESERVER/ICE/Ice/EndpointIF.h
inc/ICESERVER/ICE/Ice/Exception.h
inc/ICESERVER/ICE/Ice/FactoryTable.h
inc/ICESERVER/ICE/Ice/FactoryTableDef.h
inc/ICESERVER/ICE/Ice/Functional.h
inc/ICESERVER/ICE/Ice/GCCountMap.h
inc/ICESERVER/ICE/Ice/GCShared.h
inc/ICESERVER/ICE/Ice/Handle.h
inc/ICESERVER/ICE/Ice/Ice.h
inc/ICESERVER/ICE/Ice/IdentityUtil.h
inc/ICESERVER/ICE/Ice/Incoming.h
inc/ICESERVER/ICE/Ice/IncomingAsync.h
inc/ICESERVER/ICE/Ice/IncomingAsyncF.h
inc/ICESERVER/ICE/Ice/Initialize.h
inc/ICESERVER/ICE/Ice/InstanceF.h
inc/ICESERVER/ICE/Ice/LocalObject.h
inc/ICESERVER/ICE/Ice/LocalObjectF.h
inc/ICESERVER/ICE/Ice/ObjectAdapterFactoryF.h
inc/ICESERVER/ICE/Ice/ObjectF.h
inc/ICESERVER/ICE/Ice/Outgoing.h
inc/ICESERVER/ICE/Ice/OutgoingAsync.h
inc/ICESERVER/ICE/Ice/OutgoingAsyncF.h
inc/ICESERVER/ICE/Ice/Protocol.h
inc/ICESERVER/ICE/Ice/ProtocolPluginFacade.h
inc/ICESERVER/ICE/Ice/ProtocolPluginFacadeF.h
inc/ICESERVER/ICE/Ice/Proxy.h
inc/ICESERVER/ICE/Ice/ProxyF.h
inc/ICESERVER/ICE/Ice/ProxyFactoryF.h
inc/ICESERVER/ICE/Ice/ProxyHandle.h
inc/ICESERVER/ICE/Ice/ReferenceF.h
inc/ICESERVER/ICE/Ice/ServantManagerF.h
inc/ICESERVER/ICE/Ice/Service.h
inc/ICESERVER/ICE/Ice/SliceChecksums.h
inc/ICESERVER/ICE/Ice/Stream.h
inc/ICESERVER/ICE/Ice/StreamF.h
inc/ICESERVER/ICE/Ice/StringConverter.h
inc/ICESERVER/ICE/Ice/UndefSysMacros.h
inc/ICESERVER/ICE/Ice/UserExceptionFactory.h
inc/ICESERVER/ICE/Ice/UserExceptionFactoryF.h
inc/ICESERVER/ICE/IceGrid/Perf.h
inc/ICESERVER/ICE/IcePatch2/ClientUtil.h
inc/ICESERVER/ICE/IcePatch2/Util.h
inc/ICESERVER/ICE/IceSSL/Plugin.h
inc/ICESERVER/ICE/IceStorm/Service.h
inc/ICESERVER/ICE/IceUtil/AbstractMutex.h
inc/ICESERVER/ICE/IceUtil/Algorithm.h
inc/ICESERVER/ICE/IceUtil/ArgVector.h
inc/ICESERVER/ICE/IceUtil/Base64.h
inc/ICESERVER/ICE/IceUtil/Cache.h
inc/ICESERVER/ICE/IceUtil/Cond.h
inc/ICESERVER/ICE/IceUtil/Config.h
inc/ICESERVER/ICE/IceUtil/CountDownLatch.h
inc/ICESERVER/ICE/IceUtil/CtrlCHandler.h
inc/ICESERVER/ICE/IceUtil/DisableWarnings.h
inc/ICESERVER/ICE/IceUtil/Exception.h
inc/ICESERVER/ICE/IceUtil/Functional.h
inc/ICESERVER/ICE/IceUtil/Handle.h
inc/ICESERVER/ICE/IceUtil/IceUtil.h
inc/ICESERVER/ICE/IceUtil/InputUtil.h
inc/ICESERVER/ICE/IceUtil/Iterator.h
inc/ICESERVER/ICE/IceUtil/Lock.h
inc/ICESERVER/ICE/IceUtil/MD5.h
inc/ICESERVER/ICE/IceUtil/Monitor.h
inc/ICESERVER/ICE/IceUtil/Mutex.h
inc/ICESERVER/ICE/IceUtil/Options.h
inc/ICESERVER/ICE/IceUtil/OutputUtil.h
inc/ICESERVER/ICE/IceUtil/RWRecMutex.h
inc/ICESERVER/ICE/IceUtil/Random.h
inc/ICESERVER/ICE/IceUtil/RecMutex.h
inc/ICESERVER/ICE/IceUtil/ScopedArray.h
inc/ICESERVER/ICE/IceUtil/Shared.h
inc/ICESERVER/ICE/IceUtil/StaticMutex.h
inc/ICESERVER/ICE/IceUtil/StringUtil.h
inc/ICESERVER/ICE/IceUtil/Thread.h
inc/ICESERVER/ICE/IceUtil/ThreadException.h
inc/ICESERVER/ICE/IceUtil/Time.h
inc/ICESERVER/ICE/IceUtil/UUID.h
inc/ICESERVER/ICE/IceUtil/Unicode.h
inc/ICESERVER/ICE/IceXML/Parser.h
inc/ICESERVER/ICE/Slice/CPlusPlusUtil.h
inc/ICESERVER/ICE/Slice/Checksum.h
inc/ICESERVER/ICE/Slice/CsUtil.h
inc/ICESERVER/ICE/Slice/DotNetNames.h
inc/ICESERVER/ICE/Slice/JavaUtil.h
inc/ICESERVER/ICE/Slice/Parser.h
inc/ICESERVER/ICE/Slice/Preprocessor.h
inc/ICESERVER/ICE/Slice/PythonUtil.h
inc/ICESERVER/ICE/Slice/RubyUtil.h
inc/ICESERVER/ICE/Slice/VbUtil.h
inc/gtest/gtest-death-test.h
inc/gtest/gtest-message.h
inc/gtest/gtest-param-test.h
inc/gtest/gtest-param-test.h.pump
inc/gtest/gtest-printers.h
inc/gtest/gtest-spi.h
inc/gtest/gtest-test-part.h
inc/gtest/gtest-typed-test.h
inc/gtest/gtest.h
inc/gtest/gtest_pred_impl.h
inc/gtest/gtest_prod.h
inc/gtest/internal/gtest-death-test-internal.h
inc/gtest/internal/gtest-filepath.h
inc/gtest/internal/gtest-internal.h
inc/gtest/internal/gtest-linked_ptr.h
inc/gtest/internal/gtest-param-util-generated.h
inc/gtest/internal/gtest-param-util-generated.h.pump
inc/gtest/internal/gtest-param-util.h
inc/gtest/internal/gtest-port.h
inc/gtest/internal/gtest-string.h
inc/gtest/internal/gtest-tuple.h
inc/gtest/internal/gtest-tuple.h.pump
inc/gtest/internal/gtest-type-util.h
inc/gtest/internal/gtest-type-util.h.pump
inc/sqlite3.h
inc/winpcap/bittypes.h
inc/winpcap/ip6_misc.h
inc/winpcap/pcap-bpf.h
inc/winpcap/pcap-namedb.h
inc/winpcap/pcap-stdinc.h
inc/winpcap/pcap.h
inc/winpcap/pcap/bluetooth.h
inc/winpcap/pcap/bpf.h
inc/winpcap/pcap/namedb.h
inc/winpcap/pcap/pcap.h
inc/winpcap/pcap/sll.h
inc/winpcap/pcap/usb.h
inc/winpcap/pcap/vlan.h
lib_src/CoeffMatrixConvertor/CoeffMatrixConvertor.cpp
src/AdcBoard/AdcBoard.cpp
src/AdcBoard/AdcBoard.h
src/AdcBoard/AdcBoard.vcproj
src/AdcBoard/AdcBoardInner.cpp
src/AdcBoard/AdcBoardInner.h
src/AdcBoard/FrameParser.cpp
src/AdcBoard/FrameParser.h
src/AdcBoard/TaskData.cpp
src/AdcBoard/TaskData.h
src/AdcBoard/TaskDataMgr.cpp
src/AdcBoard/TaskDataMgr.h
src/AdcBoard/stdafx.h
src/BHAdcFastVariantSampler/BHAdcFastVariantSampler.cpp
src/BHAdcSimulator/AdcSimulator.cpp
src/BHDaqController/BHDaqController.cpp
src/Common/sgsmooth.cpp
src/Common/sgsmooth.h
src/KDDAQ/Processor.cpp
src/KDDataReplayer/KDDataReplayer.rc
src/KDFilterLib/KDFilterLib.rc
src/KDSample/KDSample.rc
src/KDSenderSimulator/CReceiverSampler.rc
src/KDSimulator/KDSimulator.rc
src/ModbusComm/ModbusTcpCom.cpp
src/ModbusComm/ModbusTcpCom.h
src/ModbusComm/ModbusTcpGen.cpp
src/ModbusComm/ModbusTcpGen.h
src/ModbusComm/PCSerialComm.rc
src/ModbusComm/PCSerialComm.vcproj
src/ModbusComm/PCSerialCommDlg.cpp
src/ModbusComm/PCSerialCommDlg.h
src/ModbusComm/WatchDogFlag.cpp
src/ModbusComm/WatchDogFlag.h
src/ModbusComm/resource.h
src/Winet/MyCommandLineParser.cpp
tools/version.sh