Change #1130

Changed by	chenjing
Changed at	Sat 09 Jan 2021 09:50:49
Repository	http://192.168.123.218:8888/svn/BH5000/DAQ/trunk
Project	DAQ
Revision	14313

Comments

[Merge] 合并git改动

[CHG] 使用模块号+通道号检索通道
[CHG] 更新BH7000 2.7驱动
[CHG] 采样点数限制从 100,000 放大到 1,000,000
[CHG] 修改界面上的公司、版本信息

Changed files

inc/FastVariantDataStructure/MeasPoint.h
inc/FastVariantDataStructure/Rev.h
inc/FastVariantDataStructure/SampleBoard.h
inc/FixDef_Daq.h
src/BHAdcFastVariantSampler/AdcSampleBoard.cpp
src/BHAdcFastVariantSampler/AdcSampleBoard.h
src/BHAdcFastVariantSampler/BHAdcFastVariantSampler.cpp
src/BHAdcFastVariantSampler/GeneralSampleBoard.cpp
src/BHAdcFastVariantSampler/GeneralSampleBoard.h
src/BHAdcFastVariantSampler/GeneralSampleBoardConfig.cpp
src/BHAdcFastVariantSampler/ReplaySampleBoard.cpp
src/BHAdcFastVariantSampler/ReplaySampleBoard.h
src/BHAdcFastVariantSampler/SampleBoardConfig.hpp
src/BHAdcFastVariantSampler/SplitThread.cpp
src/BHAlarmDataSampler/AlarmDataLoader.cpp
src/BHAlarmDataSampler/AlarmDataSampleBoard.cpp
src/BHAlarmDataSampler/AlarmDataSampleBoard.h
src/BHAlarmDataSampler/stdafx.h
src/BHPlant/MeasPoint.cpp
src/BHPlant/Rev.cpp
src/Common/PlantInfoTransverter.cpp
src/ConfigAssistant/ConfigAssistant.rc
src/KDDAQ/KDDAQ.rc
src/KDDAQ/KDDAQ.vcproj