search

labscript-suite-temp / labscript_devices

Module containing labscript suite hardware compatibility, separate from the main programs. Device compatibility is implemented with a plugin architecture, for modularity and extensibility. Each file in this module contains a labscript device class, a BLACS tab class, a BLACS worker class and a runviewer parser class for a particular device. These implement functionality for the device which the programs in question call on when they encounter each device in user labscript code, hdf5 files, or connection tables.
0 stars 0 forks source link

Runviewer does not process flags >11 for PulseBlaster_No_DDS #20

Closed philipstarkey closed 7 years ago

philipstarkey commented 7 years ago

Original report (archived issue) by David Meyer (Bitbucket: dihm, GitHub: dihm).

It also prevents runviewer from loading any traces from devices connected to the pulseblaster.

This is due to a typo I made in pull request #10 in the Parser.

num_DO needs to be num_flags, as it is in the parent class. Oops.

Is there a better way to fix it than me making a hotfix branch and sending a pull request?

philipstarkey commented 7 years ago

Original comment by Chris Billington (Bitbucket: cbillington, GitHub: chrisjbillington).

Resolves issue #20

→ \<\<cset f8532ee8467de6f9daea84fc6e0eea2688ccb3a4>>

philipstarkey commented 7 years ago

Original comment by Chris Billington (Bitbucket: cbillington, GitHub: chrisjbillington).

I've just pushed a commit that fixes it.

I'm sure nobody will mind that I did that, but yes, we've agreed to make all changes via pull requests, so in sticking with that your options other than a new named branch would be:

If you haven't made any other commits to your default branch, you can issue a pull request from your default branch to the mainline default branch - then you won't need to make another branch. That's completely fine, we are not relying on branch names for anything. I avoid that because my default branch is a mess that nobody should pull from.

You can also re-use branches - I have a "bugfix" branch and just re-use it all the time. Even if you check the box in bitbucket's interface to close the branch once merged, committing to it in future will just re-open it.

Probably some options with "bookmarks" too, which function like git's branches, but I'm not as familiar with them so I'm not sure what the options are there.