Change #84

Comments

Merged revision(s) 14355-14399 from DAQ/trunk:
*CHG*保存数据功能根据配置来
........
[BUG] 解决无法触发后处理的问题
........
[CHG] 根据模块名检测是否需要进行特征值快变判断
........
*CHG*整合滤波算法，修改名称
........
[CHG] rc文件添加版本信息
........
[CHG] cyd: 修改报警判断，由数采同步中间件报警线后，先进行报警判断获取波形并缓存后再根据中间件是否报警决定是否发送波形
........
[CHG] 添加缺失文件
........
*CHG*将报警相关信息传入报警管理类
........

Changed files

• .gitignore
• BHDAQDev.sln
• BHWireless.sln
• README.md
• bin
• bin/Debug/bh_Filterd.dll
• inc
• inc/bh_Filter.h
• lib
• lib/Debug/bh_Filterd.lib
• src
• src/BHDaqTest
• src/BHWirelessTest
• src/KDDAQ/Helper.cpp
• src/KDDAQ/Helper.h
• src/KDDAQ/KDDAQ.cpp
• src/KDDAQ/KDDAQ.vcproj
• src/KDDAQ/Processor.cpp
• src/KDDAQ/stdafx.h
• src/NewModbusWireless/AlarmDataMgr.cpp
• src/NewModbusWireless/AlarmDataMgr.h
• src/NewModbusWireless/BHPackage.h
• src/NewModbusWireless/DlgSynConfigInfo.cpp
• src/NewModbusWireless/DlgSynPlant.cpp
• src/NewModbusWireless/HelperFunctions.hpp
• src/NewModbusWireless/HistoryDataMgr.cpp
• src/NewModbusWireless/ModbusDefine.h
• src/NewModbusWireless/ModbusWirelessDataSendThread.cpp
• src/NewModbusWireless/ModbusWirelessDataSendThread.h
• src/NewModbusWireless/ModbusWirelessDlg.cpp
• src/NewModbusWireless/ModbusWirelessDlg.h
• src/NewModbusWireless/ModbusWirelessJson.cpp
• src/NewModbusWireless/ModbusWirelessParam.h
• src/NewModbusWireless/NewModbusWireless.vcproj
• src/NewModbusWireless/ThreadModbusDaq.cpp
• src/NewModbusWireless/ThreadModbusDaq.h
• src/NewModbusWireless/WirelessGateway.cpp
• src/NewModbusWireless/WirelessGateway.h
• src/NewModbusWireless/WirelessMeasPoint.cpp
• src/NewModbusWireless/WirelessPlant.cpp
• src/NewModbusWireless/WirelessPlant.h
• src/NewModbusWireless/WirelessSensor.h
• src/NewModbusWireless/WirelessSubSensor.h
• src/NewModbusWireless/Zoom_Wave.h
• src/NewModbusWireless/bh_Filter5k.h
• src/NewWirelessDAQ/BHHelperDefine.h
• src/NewWirelessDAQ/ConcentratorComm.cpp
• src/NewWirelessDAQ/NewWirelessDAQ.json
• src/NewWirelessDAQ/NewWirelessDAQ.vcproj
• src/NewWirelessDAQ/ThreadDataProcess.cpp
• src/NewWirelessDAQ/ThreadWirelessDaq.cpp
• src/NewWirelessDAQ/Zoom_Wave.h