srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

TTLInOut: timestamp -> timestamp_mu

This commit is contained in:
Sebastien Bourdeauducq 2015-07-13 23:21:29 +02:00
parent 820ff2da2c
commit 56fc7a484c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/coredevice/ttl.py
View File

@ -195,7 +195,7 @@ class TTLInOut:
return count return count
@kernel @kernel
def timestamp(self): def timestamp_mu(self):
"""Poll the RTIO input and returns an event timestamp, according to """Poll the RTIO input and returns an event timestamp, according to
the gating. the gating.

4
artiq/test/coredevice.py
View File

@ -26,7 +26,7 @@ class RTT(EnvExperiment):
delay(1*us) delay(1*us)
t0 = now_mu() t0 = now_mu()
self.ttl_inout.pulse(1*us) 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): class Loopback(EnvExperiment):
@ -48,7 +48,7 @@ class Loopback(EnvExperiment):
delay(1*us) delay(1*us)
t0 = now_mu() t0 = now_mu()
self.loop_out.pulse(1*us) 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): class ClockGeneratorLoopback(EnvExperiment):