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

pdq2/mediator: fix arm

This commit is contained in:
Sebastien Bourdeauducq 2015-07-05 19:07:31 +02:00
parent 58c0150822
commit 2bc8286f3f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,7 @@ class _Frame:
self.pdq = pdq self.pdq = pdq
self.frame_number = frame_number self.frame_number = frame_number
self.segments = [] self.segments = []
self.segment_count = 0 self.segment_count = 0 # == len(self.segments), used in kernel
self.invalidated = False self.invalidated = False
@ -184,6 +184,7 @@ class CompoundPDQ2(AutoDB):
raise ArmError raise ArmError
for frame in self.frames: for frame in self.frames:
frame._arm() frame._arm()
self.armed = True
full_program = [f._get_program() for f in self.frames] full_program = [f._get_program() for f in self.frames]
for n, pdq2 in enumerate(self.pdq2s): for n, pdq2 in enumerate(self.pdq2s):