Skip to content

Commit

Permalink
TTLInOut: timestamp -> timestamp_mu
Browse files Browse the repository at this point in the history
sbourdeauducq committed Jul 13, 2015
1 parent 820ff2d commit 56fc7a4
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion artiq/coredevice/ttl.py
Original file line number Diff line number Diff line change
@@ -195,7 +195,7 @@ def count(self):
return count

@kernel
def timestamp(self):
def timestamp_mu(self):
"""Poll the RTIO input and returns an event timestamp, according to
the gating.
4 changes: 2 additions & 2 deletions artiq/test/coredevice.py
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ def run(self):
delay(1*us)
t0 = now_mu()
self.ttl_inout.pulse(1*us)
self.set_rtt(mu_to_seconds(self.ttl_inout.timestamp() - t0))
self.set_rtt(mu_to_seconds(self.ttl_inout.timestamp_mu() - t0))


class Loopback(EnvExperiment):
@@ -48,7 +48,7 @@ def run(self):
delay(1*us)
t0 = now_mu()
self.loop_out.pulse(1*us)
self.set_rtt(mu_to_seconds(self.loop_in.timestamp() - t0))
self.set_rtt(mu_to_seconds(self.loop_in.timestamp_mu() - t0))


class ClockGeneratorLoopback(EnvExperiment):

0 comments on commit 56fc7a4

Please sign in to comment.