search

BBN-Q / PyQLab

A python library for instrument control and superconducting QIP experiments.
Apache License 2.0
25 stars 11 forks source link

Generalizes plugins to include digitizers in addition to AWGs. #81

Closed bcdonovan closed 9 years ago

bcdonovan commented 9 years ago

This adds the ability to add a digitizer plugin in addition to an AWG plugin. I have not moved any of the existing digitizer drivers just added the ability to add more. Also added the ability to add a custom enaml plugin for the GUI.

blakejohnson commented 9 years ago

@bcdonovan Sorry, I tried squashing this into one commit and evidently broke something. It should be restored to the state you left it in now.

bcdonovan commented 9 years ago

@blakejohnson The network diagram has this branching from the 28 September tip of develop. I rebased this afternoon. Perhaps you need to pull this branch before your merge squash?

blakejohnson commented 9 years ago

@bcdonovan check out the parent of 986821e999eeb3849760f994aa944c9c0d50375c, even on the network diagram.

blakejohnson commented 9 years ago

Somehow that commit, instead of being rebased on develop, is reaching much further back in time.

bcdonovan commented 9 years ago

@blakejohnson I think I've set this branch up the way you had in mind. Now an up-to-date parent and I went ahead and did the squash.

blakejohnson commented 9 years ago

Looks like some of the tests also need to be updated for the new AWG import mechanism.