Change #2466

Changed by	chenjing
Changed at	Tue 23 Dec 2025 08:48:25
Repository	http://192.168.123.218:8888/svn/BH5000/DAQ/trunk
Project	DAQ
Revision	16881

Comments

[Merge] 合并扶梯分支代码

Changed files

inc/JsonAccessEx.h
inc/PeriodicalDataDefine.h
inc/Plant.h
inc/PlantInfo.h
inc/PlantStructures.h
src/BHCommon/ActivityDataSelector.cpp
src/BHCommon/ActivityDataSelector.h
src/BHCommon/BHCommon.vcproj
src/BHCommon/LiftBrakeCalcV2.cpp
src/BHCommon/LiftBrakeCalcV2.h
src/BHDaqTest/BHDaqTest.vcproj
src/BHDaqTest/LiftBrakeTest.cpp
src/BHPlant/Plant.cpp
src/BHPlant/PlantInfo.cpp
src/ConfigAssistant/ConfigAssistant.cpp
src/ConfigAssistant/ConfigAssistant.rc
src/ConfigAssistant/ConfigAssistant.vcproj
src/ConfigAssistant/DlgBrakeDistanceSet.cpp
src/ConfigAssistant/DlgBrakeDistanceSet.h
src/ConfigAssistant/MeasuringPointsDlg.cpp
src/ConfigAssistant/MeasuringPointsDlg.h
src/ConfigAssistant/resource.h
src/KDDAQ/BrakeDistanceComputer.cpp
src/KDDAQ/BrakeDistanceComputer.h
src/KDDAQ/CVoltageComputer.h
src/KDDAQ/KDDAQ.cpp
src/KDDAQ/Processor.cpp