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

pxi6733: minor mediator fixes

This commit is contained in:
Sebastien Bourdeauducq 2015-09-04 18:53:50 -06:00
parent 63d4907c65
commit 2921bd6501
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
artiq/devices/pxi6733/mediator.py
View File

@ -58,6 +58,9 @@ class _Segment:
raise ArmError raise ArmError
self.lines.append((duration, channel_data)) self.lines.append((duration, channel_data))
def get_sample_count(self):
return sum(duration for duration, _ in self.lines)
@kernel @kernel
def advance(self): def advance(self):
if self.frame.invalidated: if self.frame.invalidated:
@ -107,13 +110,13 @@ class _Frame:
self.invalidated = True self.invalidated = True
def _get_samples(self): def _get_samples(self):
program = [ program = [[
{ {
"dac_divider": 1, "dac_divider": 1,
"duration": duration, "duration": duration,
"channel_data": channel_data, "channel_data": channel_data,
} for duration, channel_data in segment.lines } for segment in self.segments
for segment in self.segments] for duration, channel_data in segment.lines]]
synth = Synthesizer(self.daqmx.channel_count, program) synth = Synthesizer(self.daqmx.channel_count, program)
synth.select(0) synth.select(0)
# not setting any trigger flag in the program causes the whole # not setting any trigger flag in the program causes the whole
@ -145,7 +148,7 @@ class CompoundDAQmx:
self.daqmx = dmgr.get(daqmx_device) self.daqmx = dmgr.get(daqmx_device)
self.clock = dmgr.get(clock_device) self.clock = dmgr.get(clock_device)
self.channel_count = channel_count self.channel_count = channel_count
if self.sample_rate_in_mu: if sample_rate_in_mu:
self.sample_rate = sample_rate self.sample_rate = sample_rate
else: else:
self.sample_rate = self.clock.frequency_to_ftw(sample_rate) self.sample_rate = self.clock.frequency_to_ftw(sample_rate)