Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add methods in powersupplies.rigol, scopes.rigol #100

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

czee
Copy link
Contributor

@czee czee commented Sep 19, 2019

  • Fix a syntax error in powermeters.newport preventing driver_info generation
  • Use correct var names so that the driver_info file can parse the other Rigol
    drivers
  • Regenerate driver_info.py

- Fix a syntax error in powermeters.newport preventing driver_info generation
- Use correct var names so that the driver_info file can parse the other Rigol
  drivers
- Regenerate driver_info.py
@czee czee changed the title Add Rigol methods Add methods in powersupplies.rigol, scopes.rigol Sep 19, 2019
@@ -53,6 +53,8 @@ class DP700(RigolPowerSupply, VisaMixin):
current_protection_state = SCPI_Facet('SOURce:CURRent:PROTection:STATe', convert=OnOffState)
output = SCPI_Facet('OUTPut:STATe', convert=OnOffState)
beeper = SCPI_Facet('SYSTem:BEEPer', convert=OnOffState)
measured_voltage = SCPI_Facet('MEASure:VOLTage', convert=float, readonly=True, units='A')
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like a typo here, units should be volts

from pint import UndefinedUnitError
from pint import UndefinedUnitError, UnitRegistry
Copy link
Contributor

Choose a reason for hiding this comment

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

Doesn't look like this new import is used anywhere

@natezb
Copy link
Contributor

natezb commented Oct 2, 2019

Thanks for this! There are just a few minor notes I had, which I reviewed above. Additionally, I'm going to hold off on accepting the VISA transaction changes until we discuss it a bit more. I'll comment about that on the separate PR you made for it.

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.

2 participants