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: 9b87933287d6
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: 9f5227724595
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Apr 21, 2015

  1. pxi6733: minor fixes

    sbourdeauducq committed Apr 21, 2015
    Copy the full SHA
    17f61b8 View commit details
  2. Copy the full SHA
    9f52277 View commit details
Showing with 8 additions and 7 deletions.
  1. +2 −1 artiq/coredevice/core.py
  2. +4 −4 artiq/devices/pxi6733/driver.py
  3. +1 −1 benchmarks/ddb.pyon
  4. +1 −1 examples/master/ddb.pyon
3 changes: 2 additions & 1 deletion artiq/coredevice/core.py
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@

from artiq.language.core import *
from artiq.language.db import *
from artiq.language.units import ns

from artiq.transforms.inline import inline
from artiq.transforms.lower_units import lower_units
@@ -47,7 +48,7 @@ def _no_debug_unparse(label, node):
class Core(AutoDB):
class DBKeys:
comm = Device()
ref_period = Argument()
ref_period = Argument(8*ns)
external_clock = Argument(False)

def build(self):
8 changes: 4 additions & 4 deletions artiq/devices/pxi6733/driver.py
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ def load_sample_values(self, values):
configures a task to output those samples at each clock rising
edge.
A callback is registered to clear the task (unallocate resources)
A callback is registered to clear the task (deallocate resources)
when the task has completed.
:param values: A numpy array of sample values to load in the device.
@@ -52,10 +52,10 @@ def load_sample_values(self, values):
self.daq.DAQmx_Val_GroupByChannel, values,
byref(num_samps_written), None)
if num_samps_written.value != len(values):
raise Exception("Error: only {} sample values were written"
.format(num_samps_written.value))
raise IOError("Error: only {} sample values were written"
.format(num_samps_written.value))
if ret:
raise Exception("Error while writing samples to channel's buffer")
raise IOError("Error while writing samples to the channel buffer")

done_callback = self.daq.DAQmxDoneEventCallbackPtr(done_callback_py)
self.tasks.append(t.taskHandle)
2 changes: 1 addition & 1 deletion benchmarks/ddb.pyon
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
"type": "local",
"module": "artiq.coredevice.core",
"class": "Core",
"arguments": {"ref_period": Quantity(Fraction(8, 1000000000), "s")}
"arguments": {}
},

"pmt0": {
2 changes: 1 addition & 1 deletion examples/master/ddb.pyon
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
"type": "local",
"module": "artiq.coredevice.core",
"class": "Core",
"arguments": {"ref_period": Quantity(Fraction(8, 1000000000), "s")}
"arguments": {}
},

"pmt0": {