M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

pdq2.mediator: cleanup/style

This commit is contained in:
Robert Jördens 2016-02-21 17:33:45 +01:00
parent e3e42216a2
commit 294eac19fe
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
artiq/devices/pdq2/mediator.py
View File

@ -1,5 +1,4 @@
from artiq.language.core import * from artiq.language import *
from artiq.language.units import *
frame_setup = 20*ns frame_setup = 20*ns
@ -63,8 +62,8 @@ class _Segment:
if not self.frame.pdq.armed: if not self.frame.pdq.armed:
raise ArmError() raise ArmError()
# If a frame is currently being played, check that we are next. # If a frame is currently being played, check that we are next.
if (self.frame.pdq.current_frame >= 0 if (self.frame.pdq.current_frame >= 0 and
and self.frame.pdq.next_segment != self.segment_number): self.frame.pdq.next_segment != self.segment_number):
raise SegmentSequenceError() raise SegmentSequenceError()
self.frame.advance() self.frame.advance()