Builder Source Build #3305

Results:

Build successful

SourceStamp:

BuildSlave:

Reason:

Triggerable(SourceTriggerableScheduler)

Steps and Logfiles:

1. CheckoutSource update ( 1 secs )
   1. stdio

Build Properties:

Blamelist:

1. chenjing

Timing:

Resubmit Build:

All Changes:

1. Change #2367

   Changed by	chenjing
   Changed at	Fri 11 Jul 2025 15:49:38
   Repository	http://192.168.123.218:8888/svn/BH5000/DAQ/trunk
   Project	DAQ
   Revision	16331

   Comments

   [CHG] 合并远程采集分支
   
   r16323
   [CHG] 项目属性编译优化调整 
   ---------------------
   r16322
   [CHG]通过保存数据组件控制是否保存原始数据
   ---------------------
   r16321
   [CHG]某个通道是否有数据通过channelConfig数据判断，不以回放数据作为依据
   ---------------------
   r16320
   [BUG]数据回放逻辑调式问题修改
   ---------------------
   r16312
   [CHG] 使用宏区分工程项目 
   ---------------------
   r16305
   [CHG]存储数据回放功能（GDriver接口实现）
   ---------------------
   r16299
   [CHG] 使用SampleBoard的派生类获取远程采集数据 
   ---------------------
   r16288
   [CHG]BoardData数据文件读写逻辑修改
   ---------------------
   r16285
   [ADD]添加数据存储逻辑
   ---------------------
   r16276
   [DEL]删除编译文件
   ---------------------
   r16274
   [BUG]解决多设备重新初始化时只close第一个设备的BUG
   ---------------------
   r16273
   [BHAdcRemoteSampler] 修改初始化超时时长
   ---------------------
   r16271
   [BHAdcRemoteSampler] 修复通道号匹配错误的问题
   ---------------------
   r16260
   [CHG] 新增远程小在线采集功能
   ---------------------
   r16259
   [BUG]修改通用采集初始化驱动未启动的BUG
   ---------------------
   r16258
   [CHG]优化初始化逻辑
   ---------------------
   r16257
   [CHG]远程采集模式小在线模块
   ---------------------
   r16255
   [CHG]zmq远程采集模式集成小在线
   ---------------------
   r16251
   [CHG]1. 采集发生错误/重新开始采集前需要 CloseDevice 再重新 OpenDevice. 2. 运行过程中不能调用 GetMoudleStatus 3.7000L 测试中发现硬件在 OpenDevice 后立即读取模块在线状态的话读取到的模块在线状态可能存在错误，因此添加 150ms 的睡眠时间
   ---------------------
   r16250
   [CHG] RemoteSampleBoard 优化初始化线程和数据订阅线程
   ---------------------
   r16249
   [CHG]1、删除调试日志 2、配置信息和驱动只初始化一次。
   ---------------------
   r16248
   [CHG] RemoteSampleBoard 修复程序退出时线程未正常结束的问题
   ---------------------
   r16246
   [CHG]删除多余注释
   ---------------------
   r16245
   [CHG] BHDAQ 新增远程采集功能
   ---------------------
   r16238
   [BUG]无效通道不发空包
   ---------------------
   r16232
   [CHG]删掉注释的代码
   ---------------------
   r16231
   [CHG]优化采集逻辑
   ---------------------
   r16229
   [CHG]ip改为*
   ---------------------
   r16228
   [BUG]通讯调试过程中遇到的BUG
   ---------------------
   r16223
   [BUG]驱动初始化之后启动发数线程
   ---------------------
   r16221
   [CHG]param1和param2通过int类型传递
   ---------------------
   r16220
   [BHG]修复编译错误
   ---------------------
   r16218
   [CHG]1、通过req传递参数初始化数采 2、通过sub订阅模式发送采集的数据（添加遗漏文件）
   ---------------------
   r16217
   [CHG]1、通过req传递参数初始化数采 2、通过sub订阅模式发送采集的数据
   ---------------------
   r16199
   [CHG]zmq驱动采集添加通讯逻辑
   ---------------------
   

   Changed files

   • DAQ.sln
   • bin/Release/kddaq.json
   • src/BHAdcFastVariantSampler/AdcRemoteBoard.cpp
   • src/BHAdcFastVariantSampler/AdcRemoteBoard.h
   • src/BHAdcFastVariantSampler/BHAdcRemoteSampler.cpp
   • src/BHAdcFastVariantSampler/BHAdcRemoteSampler.def
   • src/BHAdcFastVariantSampler/BHAdcRemoteSampler.h
   • src/BHAdcFastVariantSampler/BHAdcRemoteSampler.vcproj
   • src/BHAdcFastVariantSampler/BHRemoteSampler.cpp
   • src/BHAdcFastVariantSampler/BHRemoteSampler.def
   • src/BHAdcFastVariantSampler/BHRemoteSampler.h
   • src/BHAdcFastVariantSampler/BHRemoteSampler.vcproj
   • src/BHAdcFastVariantSampler/RemoteSample.cpp
   • src/BHAdcFastVariantSampler/RemoteSample.h
   • src/BHAdcFastVariantSampler/SampleBoardConfig.hpp
   • src/BHAdcFastVariantSampler/stdafx.h
   • src/BHCommon/ActivitySampler.cpp
   • src/BHCommon/BHCommon.vcproj
   • src/BHCommon/FieldCodes.h
   • src/BHCommon/StorageManager.cpp
   • src/BHCommon/StorageManager.h
   • src/BHPlant/ConfigChecker.cpp
   • src/DAQZmqServer
   • src/KDDAQ/BHDAQ.txt
   • src/KDDAQ/BHDaqPatch.ini
   • src/KDDAQ/KDDAQ.cpp
   • src/KDDAQ/KeyInfo.ini
   • src/KDDAQ/threads.cpp
   • src/LocaleStrings/BHLocale.cpp
   • src/RemoteSampleBoard
   • src/replayDataSampler

2. Change #2368

   Changed by	chenjing
   Changed at	Fri 11 Jul 2025 15:49:38
   Repository	http://192.168.123.218:8888/svn/BH5000/DAQ/trunk
   Project	DAQ
   Revision	16332

   Comments

   [CHG] 提交漏提交的改动

   Changed files

   • src/BHAdcFastVariantSampler/BHAdcFastVariantSampler.cpp
   • src/BHAdcFastVariantSampler/BHAdcFastVariantSampler.h
   • src/BHCommon/RevCyclicDataProducer.h