Change #972

Comments

[MERGE] 合并git改动

[NEW] 支持通用驱动采集
[NEW] 添加选择传感器量程后自动填写灵敏度功能
[NEW] 柴油机添加瞬时转速计算
[CHG] 使用核电版本相位校准算法
[CHG] 添加起始相位调整功能
[CHG] 启停车数据队列发送逻辑修改为从前往后发送
[CHG] 修改测点采样点数、采样率最大限制，修改触发门限小数点后位数
[CHG] 去除整周期数不得小于2的限制

Changed files

• DAQ.sln
• bin/Release/AC0008CTPcieDriver.dll
• bin/Release/AC0015CTS24PcieDriver.dll
• bin/Release/AC0016CTS16PcieDriver.dll
• bin/Release/BH7000NetDriver.dll
• bin/Release/BH7000PcieDriver.dll
• bin/Release/BHModbusComm.ini
• bin/Release/GeneralDaqConfig.exe
• bin/Release/HardwareInfo.json
• bin/Release/PcieDrvApi.dll
• bin/Release/PcieDrvApiCT.dll
• bin/Release/PcieDrvApiS16CT.dll
• bin/Release/PcieDrvApiS24CT.dll
• bin/Release/PlxApi650.dll
• bin/Release/Qt5Core.dll
• bin/Release/Qt5Gui.dll
• bin/Release/Qt5Widgets.dll
• bin/Release/WaveSimulation.dll
• bin/Release/borlndmm.dll
• bin/Release/cc32120mt.dll
• bin/Release/emuNetDriver.dll
• bin/Release/lib_key_phase.dll
• bin/Release/plugins
• bin/Release/plugins/platforms
• bin/Release/plugins/platforms/qwindows.dll
• bin/Release/qt.conf
• bin/Release/wdapi1020_32.dll
• bin/Release/仿真测试驱动配置.json
• bin/Release/通用驱动信息.json
• bin/Release/通用驱动配置.json
• inc/FastVariantDataStructure/Channel.h
• inc/FastVariantDataStructure/FastVariantDataStructures.h
• inc/PlantBasicInfo.h
• inc/PlantInfo.h
• inc/SudIdMgr.h
• src/BHAdcFastVariantSampler/AlarmDataSave.cpp
• src/BHAdcFastVariantSampler/BHAdcFastVariantSampler.cpp
• src/BHAdcFastVariantSampler/BHAdcFastVariantSampler.h
• src/BHAdcFastVariantSampler/BHAdcFastVariantSampler.rc
• src/BHAdcFastVariantSampler/BHAdcFastVariantSampler.vcproj
• src/BHAdcFastVariantSampler/PeriodicalDataQueue.cpp
• src/BHAdcFastVariantSampler/RuntimeCyclicBuffer.cpp
• src/BHAdcFastVariantSampler/SplitThread.cpp
• src/BHAdcFastVariantSampler/SplitThread.h
• src/BHAdcFastVariantSampler/TimeSpanDataQueue.cpp
• src/BHAdcFastVariantSampler/stdafx.h
• src/BHAlarmDataSampler/AlarmDataLoader.cpp
• src/BHAlarmDataSampler/AlarmDataLoader.h
• src/BHAlarmDataSampler/BHAlarmDataSampler.vcproj
• src/BHPlant/BHPlant.vcproj
• src/BHPlant/Channel.cpp
• src/BHPlant/ConfigChecker.cpp
• src/BHPlant/DieselPlantBasicInfo.cpp
• src/BHPlant/DieselPlantBasicInfo.h
• src/BHPlant/PlantBasicInfo.cpp
• src/BHPlant/PlantBasicInfo.h
• src/BHPlant/PlantInfo.cpp
• src/Common/PlantInfoTransverter.cpp
• src/Common/PlantInfoTransverter.h
• src/ConfigAssistant/ConfigAssistant.rc
• src/ConfigAssistant/ConfigAssistant.vcproj
• src/ConfigAssistant/CtrDlg.cpp
• src/ConfigAssistant/FastVariantConfig.cpp
• src/ConfigAssistant/MeasuringPointsDlg.cpp
• src/ConfigAssistant/MeasuringPointsDlg.h
• src/ConfigAssistant/resource.h
• src/KDDAQ/DSComm.cpp
• src/KDDAQ/DiselKeyPhaseProcessor.cpp
• src/KDDAQ/DiselKeyPhaseProcessor.h
• src/KDDAQ/InstVelTimeComputer.cpp
• src/KDDAQ/KDDAQ.cpp
• src/KDDAQ/KDDAQ.rc
• src/KDDAQ/KDDAQDlg.cpp
• src/KDDAQ/Processor.cpp
• src/KDDAQ/Processor.h
• src/KDDAQ/RodRevComputer.cpp
• src/KDDAQ/SudJudge.cpp
• src/ModbusComm/ModbusTcpGen.cpp
• src/ModbusComm/PCSerialCommDlg.cpp
• src/ModbusComm/PCSerialCommDlg.h