Builder Source Build #311

Results:

Build successful

SourceStamp:

BuildSlave:

Reason:

Triggerable(SourceTriggerableScheduler)

Steps and Logfiles:

1. CheckoutSource update [branch] ( 1 secs )
   1. stdio

Build Properties:

Blamelist:

1. chenjing

Timing:

Resubmit Build:

All Changes:

1. Change #211

   Changed by	chenjing
   Changed at	Thu 21 Mar 2019 08:18:25
   Repository	http://192.168.123.218:8888/svn/BH5000/DAQ/branches/4.8.x
   Project	DAQ
   Revision	13527

   Comments

   合并武汉带波形无线网关采集软件相关改动
   
   r998
   *CHG*重构波形上传和计算超时的函数，添加上传信息结构体
   ---------------------
   r997
   *BUG*修改请求数据时的通道数以及通道赋值
   ---------------------
   r995
   *BUG*取数据的通道统计错误
   ---------------------
   r994
   *CHG*替换硬件提供的滤波算法
   ---------------------
   r980
   *BUG*同步设备测点信息时处理不同异常情况：与中间件通讯失败时重试2次，一直失败弹出提示【同中间件通讯故障】
   ---------------------
   r974
   *CHG*同步无线其他测点其他特征值用于获取电池电量信息
   ---------------------
   r973
   *CHG*添加打包时不同特征值获取
   ---------------------
   r972
   *CHG* 1、添加速度低频滤波 2、为传感器添加新通道电池电量信息通道以供绑定测点，上传该信息，方便查看历史记录 3、为新通道赋值
   ---------------------
   r970
   *BUG*修改一直读取到100%进度条的逻辑
   ---------------------
   r968
   *CHG*添加日志
   ---------------------
   r967
   *BUG*修改读取到波形进度条是100%时的处理
   ---------------------
   r951
   *BUG*修复未读取配置文件中网关的是否立即采集波形和断点续传状态的bug
   ---------------------
   r948
   *Add*添加带注释的传感器类型配置文件
   ---------------------
   r947
   *CHG*优化json文件配置，以适应金陵项目现场升级，无需重新配置
   ---------------------
   r946
   *BUG*修改仿真数据对新传感器的适应
   ---------------------
   r939
   *BUG*修复添加新传感器类型后仿真数据报错点数不足的bug
   ---------------------
   r938
   *BUG*优化逻辑
   ---------------------
   r937
   *CHG*新增超时时间可控输入-进度条不变话的超时时间，若超时则重发指令 新增是否第一次传输波形勾选框，默认不勾选 修改波形传输逻辑
   ---------------------
   r929
   CHG:为适应硬件处理底层波形数据时间延长(添加滤波)，将波形上传进度条判断间隔由30秒改为40秒写入一次波形更新标志位
   ---------------------
   r925
   *BUG*等待超时后断开重连以解决网关断电上电后出现的无法采集的问题
   ---------------------
   r916
   *CHG*修改软件软重启和自动重连后重新下发网关配置
   ---------------------
   r900
   *CHG*添加启用补点续传按钮，以兼容不同的传感器版本
   ---------------------
   r887
   *BUG*添加日志，调换特征值处理顺序
   ---------------------
   r861
   *CHG*添加请求网关向传感器节点请求波形数据时的补点重传功能
   ---------------------
   r850
   *CHG*添加异常抓取和判断波形点数
   ---------------------
   r826
   [824]*CHG*修改在获取波形时跟网关之间连接断开导致采集间隔变大的问题
   ---------------------
   r825
   
   ---------------------
   r778
   *CHG*优化判断传感器关联和更新状态
   ---------------------
   r764
   *CHG*在获取波形数据时判断传感器关联通道状态
   ---------------------
   r699
   *BUG*修复绘图是按照固定采样率绘图的bug
   ---------------------
   r698
   *BUG*1、初始启动网关会重启的bug。2、获取各个通道点数逻辑不对bug。3、兼容之前的版本保存各个测点关联通道后的采样点数和采样率 
   ---------------------
   

   Changed files

   • src/NewModbusWireless/DlgSynConfigInfo.cpp
   • src/NewModbusWireless/DlgSynPlant.cpp
   • src/NewModbusWireless/DlgWaveSpectrum.cpp
   • src/NewModbusWireless/DlgWirelessGateWaySet.cpp
   • src/NewModbusWireless/DlgWirelessGateWaySet.h
   • src/NewModbusWireless/DlgWirelessSensorSet.cpp
   • src/NewModbusWireless/DlgWirelessSensorSet.h
   • src/NewModbusWireless/ModbusDefine.h
   • src/NewModbusWireless/ModbusFrameGen.cpp
   • src/NewModbusWireless/ModbusFrameGen.h
   • src/NewModbusWireless/ModbusTcpFrameParser.cpp
   • src/NewModbusWireless/ModbusWireless.rc
   • src/NewModbusWireless/ModbusWirelessDataSendThread.cpp
   • src/NewModbusWireless/ModbusWirelessDlg.cpp
   • src/NewModbusWireless/ModbusWirelessDlg.h
   • src/NewModbusWireless/ModbusWirelessJson.cpp
   • src/NewModbusWireless/ModbusWirelessParam.cpp
   • src/NewModbusWireless/ModbusWirelessParam.h
   • src/NewModbusWireless/NewModbusWireless.vcproj
   • src/NewModbusWireless/SensorInfoManager.cpp
   • src/NewModbusWireless/SensorInfoManager.h
   • src/NewModbusWireless/ThreadModbusDaq.cpp
   • src/NewModbusWireless/ThreadModbusDaq.h
   • src/NewModbusWireless/WirelessMeasPoint.cpp
   • src/NewModbusWireless/WirelessMeasPoint.h
   • src/NewModbusWireless/WirelessSensor.cpp
   • src/NewModbusWireless/WirelessSensor.h
   • src/NewModbusWireless/WirelessSubSensor.cpp
   • src/NewModbusWireless/bh_Filter25k6.cpp
   • src/NewModbusWireless/bh_Filter25k6.h
   • src/NewModbusWireless/bh_Filter5k.cpp
   • src/NewModbusWireless/bh_Filter5k.h
   • src/NewModbusWireless/resource.h