Fixed #90, and set default sample rate back to 48k

This commit is contained in:
Anne de Jong 2021-10-17 14:50:38 +02:00
parent b3476ba62f
commit 60afface35

View File

@ -87,7 +87,9 @@ public:
if (handle == 0) { if (handle == 0) {
throw runtime_error("Unable to create a handle to the specified DAQ " throw runtime_error("Unable to create a handle to the specified DAQ "
"device. Is the device currently in use?"); "device. Is the device currently in use? Please make sure to set "
"the DAQ configuration in duplex mode if simultaneous input and "
"output is required.");
} }
err = ulConnectDaqDevice(handle); err = ulConnectDaqDevice(handle);
@ -579,14 +581,14 @@ void fillUlDaqDeviceInfo(vector<DeviceInfo> &devinfolist) {
devinfo.availableSampleRates.push_back(50400); devinfo.availableSampleRates.push_back(50400);
devinfo.availableSampleRates.push_back(51000); devinfo.availableSampleRates.push_back(51000);
devinfo.prefSampleRateIndex = 5; devinfo.prefSampleRateIndex = 11;
devinfo.availableFramesPerBlock.push_back(512); devinfo.availableFramesPerBlock.push_back(512);
devinfo.availableFramesPerBlock.push_back(1024); devinfo.availableFramesPerBlock.push_back(1024);
devinfo.availableFramesPerBlock.push_back(2048); devinfo.availableFramesPerBlock.push_back(2048);
devinfo.availableFramesPerBlock.push_back(4096); devinfo.availableFramesPerBlock.push_back(4096);
devinfo.availableFramesPerBlock.push_back(8192); devinfo.availableFramesPerBlock.push_back(8192);
devinfo.prefFramesPerBlockIndex = 1; devinfo.prefFramesPerBlockIndex = 2;
devinfo.availableInputRanges = {1.0, 10.0}; devinfo.availableInputRanges = {1.0, 10.0};
devinfo.prefInputRangeIndex = 0; devinfo.prefInputRangeIndex = 0;