From 56fc7a484ceb106abe011c530d2bb1a06cd209f1 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 13 Jul 2015 23:21:29 +0200 Subject: [PATCH] TTLInOut: timestamp -> timestamp_mu --- artiq/coredevice/ttl.py | 2 +- artiq/test/coredevice.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/artiq/coredevice/ttl.py b/artiq/coredevice/ttl.py index b9d680f8f..644e55ff6 100644 --- a/artiq/coredevice/ttl.py +++ b/artiq/coredevice/ttl.py @@ -195,7 +195,7 @@ class TTLInOut: return count @kernel - def timestamp(self): + def timestamp_mu(self): """Poll the RTIO input and returns an event timestamp, according to the gating. diff --git a/artiq/test/coredevice.py b/artiq/test/coredevice.py index 8ab3b27b7..95e8573b9 100644 --- a/artiq/test/coredevice.py +++ b/artiq/test/coredevice.py @@ -26,7 +26,7 @@ class RTT(EnvExperiment): 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 @@ class Loopback(EnvExperiment): 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):