TTLInOut: timestamp -> timestamp_mu

sbourdeauducq · sbourdeauducq · commit 56fc7a484ceb · 2015-07-13T23:21:29.000+02:00
diff --git a/artiq/coredevice/ttl.py b/artiq/coredevice/ttl.py
@@ -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.
 
diff --git a/artiq/test/coredevice.py b/artiq/test/coredevice.py
@@ -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):
