diff --git a/src/MeasureDeviceController.cpp b/src/MeasureDeviceController.cpp index 7b04a58..14b5451 100644 --- a/src/MeasureDeviceController.cpp +++ b/src/MeasureDeviceController.cpp @@ -125,33 +125,17 @@ bool MeasureDeviceController::SetDeviceMeasureConfigParams(const QString &device ok = false; return ok; } - config.m_eTransferModel = eSpecturmMode; + config.m_eTransferModel = eTransferMode(cfg_params.value("TransferMode", 3).toInt()); config.m_iDeviceGain = cfg_params.value("DeviceGain", 1).toInt(); config.m_iDeviceGainSelectIndex = cfg_params.value("DeviceGainSelectIndex", 1).toInt(); - config.m_iSoftGain = cfg_params.value("SoftGain", 3000).toInt(); - config.m_iChannelNum = cfg_params.value("AddrCount", 256).toInt(); - config.m_dConstTime = cfg_params.value("TimeConst", 45).toInt(); + config.m_iSoftGain = cfg_params.value("SoftGain", 10000000).toInt(); + config.m_iChannelNum = cfg_params.value("AddrCount", 4096).toInt(); + config.m_dConstTime = cfg_params.value("TimeConst", 1).toDouble(); config.m_iCurrentOffset = cfg_params.value("DcOffset", 0).toInt(); - config.m_iRiseTime = cfg_params.value("RiseTime", 2).toInt(); - config.m_iTopTime = cfg_params.value("FlatTime", 2).toInt(); - config.m_iMaxEnergy = cfg_params.value("MaxEnergy", 1).toInt(); - config.m_iTotalMeasureTime = cfg_params.value("TotalMeasureTime", 10).toInt(); - - config.m_iFormTime = 3; - config.m_iFastChannelTrigerValue = 10; - config.m_iHighVoltage = 0; - config.m_iInputVoltageDesc = 0; - config.m_iCRDivMode = 0; - config.m_iInputSignalPostive = 0; - config.m_iAMPeakDiv = 0; - config.m_iHVDelt = 0; - config.m_iHVCtrl = 0; - config.m_iGetSpecturmPeirod = 1; - config.m_iTotalMeasureCount = 0; - config.m_iTrapeTopShitBit = 0; - config.m_bICRCorrect = 0; - config.m_iCRZAValue = 0; - config.m_iZAEnable = 0; + config.m_iFormTime = cfg_params.value("FormTime", 2).toInt(); + config.m_iFastChannelTrigerValue = cfg_params.value("FastChannelTrigerValue", 100).toDouble(); + config.m_iCRDivMode = cfg_params.value("CRDivMode", 0).toInt(); + config.m_iInputSignalPostive = cfg_params.value("InputSignalPostive", 0).toInt(); memset(config.reserve, 0, 128); ret = DBCSoftParamConfig(device_handler, &config, board_id, channel_id);