Skip to content

Keithley/update idn#194

Merged
CJvanDiepen merged 5 commits into
masterfrom
keithley/updateIDN
May 27, 2016
Merged

Keithley/update idn#194
CJvanDiepen merged 5 commits into
masterfrom
keithley/updateIDN

Conversation

@CJvanDiepen

Copy link
Copy Markdown
Contributor

Added get_idn() to the Keithley driver following on change in the base instrument class

@MerlinSmiles

Copy link
Copy Markdown
Contributor

Oh wow, I'm really sorry about that!
It wasn't my intention at all to just change it without updating the other instruments!

@giulioungaretti

Copy link
Copy Markdown
Contributor

@CJvanDiepen could you fix your github/ git email mismatch ? see https://help.github.com/articles/why-are-my-commits-linked-to-the-wrong-user/

@MerlinSmiles

Copy link
Copy Markdown
Contributor

@AdriaanRol @damazter @peendebak @alexcjohnson

The merge of the Metadata branch added an IDN parameter in the base class defined like this:

self.add_parameter('IDN', get_cmd=self.get_idn, vals=Anything())

and

    def get_idn(self, *args, **kwargs):
        return {'vendor': None, 'model': None,
                'serial': None, 'firmware': None}

The intention was to unify the IDN parameter.
I assume the update might destroy some of your instrument drivers, unfortunately I / we forgot about this during the metadata merge.
Do you want me to check all your instrument drivers and do the fixes? Or do you prefer to do it yourself?
We've seen issues before when others were fixing instrument drivers without having hardware, so it's probably best if you do it, if you don't mind.

Sorry for the inconvenience!

@alexcjohnson

Copy link
Copy Markdown
Contributor

Oh right, that was a major oversight, sorry! We also have Instrument.connect_message that should be updated to use the standardized IDN parameter, and then should be used in exactly these cases.

@alexcjohnson

Copy link
Copy Markdown
Contributor

@CJvanDiepen I assume you're up and running with this fix for now - since we can expect a bunch of drivers are broken by this change currently, I'll take a stab at updating connect_message and the drivers that use it (or could use it) in this branch.

@CJvanDiepen

Copy link
Copy Markdown
Contributor Author

@MerlinSmiles Don't worry about it! The idea of unifying IDN's seems good to me.
@alexcjohnson The driver indeed works again with the fix.
@giulioungaretti Thanks for the suggestion, I will look into it.

@giulioungaretti

Copy link
Copy Markdown
Contributor

if you need any help with that ping, also send an email to
giulio.ungaretti@gmail.com if you whish to be invited to the slack
dicussion for qcodes!

On Thu, 26 May 2016 at 14:18 CJvanDiepen notifications@github.com wrote:

@MerlinSmiles https://github.com/MerlinSmiles Don't worry about it! The
idea of unifying IDN's seems good to me.
@alexcjohnson https://github.com/alexcjohnson The driver indeed works
again with the fix.
@giulioungaretti https://github.com/giulioungaretti Thanks for the
suggestion, I will look into it.


You are receiving this because you were mentioned.

Reply to this email directly or view it on GitHub
https://github.com/qdev-dk/Qcodes/pull/194#issuecomment-221855237

@alexcjohnson

Copy link
Copy Markdown
Contributor

(oops, I didn't mean #74 in the commit message above, I meant #107 )

@CJvanDiepen do you want to try this now? I added an attempt at a generic *IDN? response parser to the VisaInstrument class - it won't work for any arbitrary junk vendors throw at us (cc @MerlinSmiles ) but it should get most common permutations.

This updates a bunch of other drivers that were probably broken since #107 because they tried to re-add IDN as a parameter... can folks give a couple of these a try and make sure I didn't muck something up?

@CJvanDiepen

Copy link
Copy Markdown
Contributor Author

@alexcjohnson thanks for the adjustments. The get_idn() works for the Keithley2700 driver.

logging.debug('Resetting instrument')
self._visainstrument.write('*RST')
self.get_all()

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No blank line at the end of file?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there were 2 blanks before.

@alexcjohnson

Copy link
Copy Markdown
Contributor

Great - since I'm pretty sure the other drivers were broken before, so can be (and hopefully are!) better but not worse now, lets 💃 - thanks again for catching this @CJvanDiepen

@CJvanDiepen CJvanDiepen merged commit 3acd85a into master May 27, 2016
@CJvanDiepen CJvanDiepen deleted the keithley/updateIDN branch May 27, 2016 09:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants