TDM input channels #221
Merged
TDM input channels #221
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ahelsing
reviewed
Sep 10, 2019
QGL/drivers/APS2Pattern.py
Outdated
| @@ -1390,7 +1390,8 @@ def tdm_instructions(seqs): | |||
|
|
|||
| elif isinstance(s, PulseSequencer.Pulse): | |||
| if s.label == 'MEAS' and s.maddr != (-1, 0): | |||
| instructions.append(CrossBar(2**s.maddr[1], 0x1, label=label)) | |||
| tdm_chan = m.channel.processor_chan.channel if getattr(m.channel, 'processor_chan') else 1 | |||
| instructions.append(CrossBar(2**m.maddr[1], 2**(tdm_chan-1))) | |||
There was a problem hiding this comment.
Why do we not need to pass along the label here?
There was a problem hiding this comment.
I think we do, I'll add it back
ahelsing
reviewed
Sep 10, 2019
| for k in range(7): # TDM has 7 digital inputs | ||
| chans.append(Channels.DigitalInput(label=f"DigitalInput-{label}-{k}", channel=k, channel_db=self.channelDatabase)) | ||
| tdm = Channels.Processor(label=label, model="TDM", address=address, trigger_interval=250e-6, channels=chans, channel_db=self.channelDatabase) | ||
| self.add_and_update_dict(tdm) |
There was a problem hiding this comment.
Out of curiosity, shouldn't this TDM have been added to the dict before? Was that a bug?
There was a problem hiding this comment.
Oops you're right, I think it was missing
ahelsing
reviewed
Sep 10, 2019
There was a problem hiding this comment.
Consider more comments explaining what you are doing and the HW assumptions. (Particularly those changes to the CrossBar calls that you had to look up again to understand.)
See also the couple individual comments I added.
Otherwise it looks fine (and didn't break anything for me).
and some comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See #204