Merge branch 'master' of github.com:m-labs/artiq

This commit is contained in:
Sebastien Bourdeauducq 2015-08-14 22:46:33 +08:00
commit 74b9601644

View File

@ -115,9 +115,9 @@ class DAQmx:
ret = t.WriteAnalogF64(samps_per_channel, False, 0, ret = t.WriteAnalogF64(samps_per_channel, False, 0,
self.daq.DAQmx_Val_GroupByChannel, values, self.daq.DAQmx_Val_GroupByChannel, values,
byref(num_samps_written), None) byref(num_samps_written), None)
if num_samps_written.value != nb_values: if num_samps_written.value != samps_per_channel:
raise IOError("Error: only {} sample values were written" raise IOError("Error: only {} sample values per channel were"
.format(num_samps_written.value)) "written".format(num_samps_written.value))
if ret: if ret:
raise IOError("Error while writing samples to the channel buffer") raise IOError("Error while writing samples to the channel buffer")