Change #717

Comments

[CHG] cyd: 修改报警判断，由数采同步中间件报警线后，先进行报警判断获取波形并缓存后再根据中间件是否报警决定是否发送波形

Changed files

• inc/bh_Filter.h
• src/BHWirelessTest/BHFilterTest.cpp
• src/BHWirelessTest/BHWirelessTest.vcproj
• src/NewModbusWireless/BHPackage.h
• src/NewModbusWireless/DlgSynConfigInfo.cpp
• src/NewModbusWireless/DlgSynPlant.cpp
• src/NewModbusWireless/DlgWirelessGateWaySet.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/bh_Filter5k.h
• src/NewWirelessDAQ/BHHelperDefine.h
• src/NewWirelessDAQ/ConcentratorComm.cpp
• src/NewWirelessDAQ/ThreadWirelessDaq.cpp
• src/bh_Filter/bh_Filter.cpp