Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1e393f5c7028
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c91cd0ab3878
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 21, 2015

  1. Copy the full SHA
    c91cd0a View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 artiq/devices/pxi6733/driver.py
3 changes: 3 additions & 0 deletions artiq/devices/pxi6733/driver.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Yann Sionneau <ys@m-labs.hk>, 2015

from ctypes import byref
import numpy as np


class DAQmxSim:
@@ -48,6 +49,8 @@ def load_sample_values(self, values):
t.CfgSampClkTiming(self.clock, 1000.0, self.daq.DAQmx_Val_Rising,
self.daq.DAQmx_Val_FiniteSamps, len(values))
num_samps_written = self.daq.int32()
values = np.require(values, dtype=float,
requirements=["C_CONTIGUOUS", "WRITEABLE"])
ret = t.WriteAnalogF64(len(values), False, 0,
self.daq.DAQmx_Val_GroupByChannel, values,
byref(num_samps_written), None)