Skip to content

Use correct sense function for sense parameters in Keysight 344xxA driver #6723

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.

Sign up for GitHub

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

Merged
jenshnielsen merged 14 commits into from
Apr 15, 2025
Merged

Use correct sense function for sense parameters in Keysight 344xxA driver #6723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9572c6d
Use correct sense function for sense parameters
janekfleper Dec 16, 2024
7578b6f
Don't use partial for NPLC
janekfleper Dec 16, 2024
202d45a
Use the get function for the get_cmd of NPLC
janekfleper Dec 17, 2024
6cebf9d
Merge branch 'microsoft:main' into Keysight-344xxA
janekfleper Mar 21, 2025
dd733d8
Apply suggested changes to get raw value from cache
janekfleper Mar 21, 2025
4c352ae
Ruff format
janekfleper Mar 21, 2025
2bb9267
Merge branch 'main' into Keysight-344xxA
einsmein Mar 28, 2025
6bbd10a
Work around issue with stale cache
jenshnielsen Apr 3, 2025
591cc8e
Merge branch 'microsoft:main' into Keysight-344xxA
janekfleper Apr 11, 2025
728447f
Add properties for all available sense functions
janekfleper Apr 11, 2025
ef71cc8
Use correct default value for NPLC properties
janekfleper Apr 14, 2025
f1896e9
Merge branch 'microsoft:main' into Keysight-344xxA
janekfleper Apr 14, 2025
89fd6c4
Merge branch 'Keysight-344xxA' of github.com:janekfleper/Qcodes into …
janekfleper Apr 14, 2025
d4504b3
Add changelog for 6723
jenshnielsen Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/changes/newsfragments/6723.improved_driver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The Keysight 344xxA drivers have been updated to ensure that ``NPLC``, ``autorange``, ``autozero``, ``apature_time`` and ```apature_mode``
parameters use the correct instrument commends for the sense mode selected by the ``sense_function`` parameter.
262 changes: 234 additions & 28 deletions src/qcodes/instrument/sims/Keysight_34465A.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,7 @@ devices:
r: "{}"
setter:
q: "SAMPle:TIMer {}"
dc_autorange:
default: 0
getter:
q: "SENSe:VOLTage:DC:RANGe:AUTO?"
r: "{}"
setter:
q: "SENSe:VOLTage:DC:RANGe:AUTO {}"
specs:
valid: [0, 1]
type: int
dc_range:
voltage_dc_range:
default: 1
getter:
q: "SENSe:VOLTage:DC:RANGe?"
Expand All @@ -131,44 +121,260 @@ devices:
10000, 100000, 1000000,
10000000, 100000000, 1000000000]
type: float
NPLC:
voltage_dc_resolution:
default: +3.00000000E-05
getter:
q: "SENSe:VOLTage:DC:RESolution?"
r: "{}"
setter:
q: "SENSe:VOLTage:DC:RESolution {}"
current_ac_autorange:
default: 0
getter:
q: "SENSe:CURR:AC:RANGe:AUTO?"
r: "{}"
setter:
q: "SENSe:CURR:AC:RANGe:AUTO {}"
specs:
valid: [0, 1]
type: int
current_dc_autorange:
default: 0
getter:
q: "SENSe:CURR:RANGe:AUTO?"
r: "{}"
setter:
q: "SENSe:CURR:RANGe:AUTO {}"
specs:
valid: [0, 1]
type: int
fresistance_autorange:
default: 0
getter:
q: "SENSe:FRES:RANGe:AUTO?"
r: "{}"
setter:
q: "SENSe:FRES:RANGe:AUTO {}"
specs:
valid: [0, 1]
type: int
resistance_autorange:
default: 0
getter:
q: "SENSe:RES:RANGe:AUTO?"
r: "{}"
setter:
q: "SENSe:RES:RANGe:AUTO {}"
specs:
valid: [0, 1]
type: int
voltage_ac_autorange:
default: 0
getter:
q: "SENSe:VOLT:AC:RANGe:AUTO?"
r: "{}"
setter:
q: "SENSe:VOLT:AC:RANGe:AUTO {}"
specs:
valid: [0, 1]
type: int
voltage_dc_autorange:
default: 0
getter:
q: "SENSe:VOLT:RANGe:AUTO?"
r: "{}"
setter:
q: "SENSe:VOLT:RANGe:AUTO {}"
specs:
valid: [0, 1]
type: int
current_ac_autozero:
default: 0
getter:
q: "SENSe:CURR:AC:ZERO:AUTO?"
r: "{}"
setter:
q: "SENSe:CURR:AC:ZERO:AUTO {}"
current_dc_autozero:
default: 0
getter:
q: "SENSe:CURR:ZERO:AUTO?"
r: "{}"
setter:
q: "SENSe:CURR:ZERO:AUTO {}"
fresistance_autozero:
default: 0
getter:
q: "SENSe:FRES:ZERO:AUTO?"
r: "{}"
setter:
q: "SENSe:FRES:ZERO:AUTO {}"
resistance_autozero:
default: 0
getter:
q: "SENSe:RES:ZERO:AUTO?"
r: "{}"
setter:
q: "SENSe:RES:ZERO:AUTO {}"
voltage_ac_autozero:
default: 0
getter:
q: "SENSe:VOLT:AC:ZERO:AUTO?"
r: "{}"
setter:
q: "SENSe:VOLT:AC:ZERO:AUTO {}"
voltage_dc_autozero:
default: 0
getter:
q: "SENSe:VOLT:ZERO:AUTO?"
r: "{}"
setter:
q: "SENSe:VOLT:ZERO:AUTO {}"
current_ac_NPLC:
default: 10.0
getter:
q: "SENSe:CURR:AC:NPLC?"
r: "{}"
setter:
q: "SENSe:CURR:AC:NPLC {}"
specs:
valid: [0.001, 0.002, 0.006, 0.02, 0.06, 0.2, 1, 10, 100]
type: float
current_dc_NPLC:
default: 10.0
getter:
q: "SENSe:VOLTage:DC:NPLC?"
q: "SENSe:CURR:NPLC?"
r: "{}"
setter:
q: "SENSe:VOLTage:DC:NPLC {}"
q: "SENSe:CURR:NPLC {}"
specs:
valid: [0.001, 0.002, 0.006, 0.02, 0.06, .2, 1, 10, 100]
valid: [0.001, 0.002, 0.006, 0.02, 0.06, 0.2, 1, 10, 100]
type: float
resolution:
default: +3.00000000E-05
fresistance_NPLC:
default: 10.0
getter:
q: "SENSe:VOLTage:DC:RESolution?"
q: "SENSe:FRES:NPLC?"
r: "{}"
setter:
q: "SENSe:VOLTage:DC:RESolution {}"
apterture_enabled:
q: "SENSe:FRES:NPLC {}"
specs:
valid: [0.001, 0.002, 0.006, 0.02, 0.06, 0.2, 1, 10, 100]
type: float
resistance_NPLC:
default: 10.0
getter:
q: "SENSe:RES:NPLC?"
r: "{}"
setter:
q: "SENSe:RES:NPLC {}"
specs:
valid: [0.001, 0.002, 0.006, 0.02, 0.06, 0.2, 1, 10, 100]
type: float
voltage_ac_NPLC:
default: 10.0
getter:
q: "SENSe:VOLT:AC:NPLC?"
r: "{}"
setter:
q: "SENSe:VOLT:AC:NPLC {}"
specs:
valid: [0.001, 0.002, 0.006, 0.02, 0.06, 0.2, 1, 10, 100]
type: float
voltage_dc_NPLC:
default: 10.0
getter:
q: "SENSe:VOLT:NPLC?"
r: "{}"
setter:
q: "SENSe:VOLT:NPLC {}"
specs:
valid: [0.001, 0.002, 0.006, 0.02, 0.06, 0.2, 1, 10, 100]
type: float
current_ac_aperture_enabled:
default: 0
getter:
q: "SENSe:CURR:AC:APERture:ENABled?"
r: "{}"
setter:
q: "SENSe:CURR:AC:APERture:ENABled {}"
current_dc_aperture_enabled:
default: 0
getter:
q: "SENSe:CURR:APERture:ENABled?"
r: "{}"
setter:
q: "SENSe:CURR:APERture:ENABled {}"
fresistance_aperture_enabled:
default: 0
getter:
q: "SENSe:FRES:APERture:ENABled?"
r: "{}"
setter:
q: "SENSe:FRES:APERture:ENABled {}"
resistance_aperture_enabled:
default: 0
getter:
q: "SENSe:RES:APERture:ENABled?"
r: "{}"
setter:
q: "SENSe:RES:APERture:ENABled {}"
voltage_ac_aperture_enabled:
default: 0
getter:
q: "SENSe:VOLT:AC:APERture:ENABled?"
r: "{}"
setter:
q: "SENSe:VOLT:AC:APERture:ENABled {}"
voltage_dc_aperture_enabled:
default: 0
getter:
q: "SENSe:VOLT:APERture:ENABled?"
r: "{}"
setter:
q: "SENSe:VOLT:APERture:ENABled {}"

current_ac_aperture_time:
default: 0
getter:
q: "SENSe:CURR:AC:APERture?"
r: "{}"
setter:
q: "SENSe:CURR:AC:APERture {}"
current_dc_aperture_time:
default: 0
getter:
q: "SENSe:CURR:APERture?"
r: "{}"
setter:
q: "SENSe:CURR:APERture {}"
fresistance_aperture_time:
default: 0
getter:
q: "SENSe:FRES:APERture?"
r: "{}"
setter:
q: "SENSe:FRES:APERture {}"
resistance_aperture_time:
default: 0
getter:
q: "SENSe:VOLTage:DC:APERture:ENABled?"
q: "SENSe:RES:APERture?"
r: "{}"
setter:
q: "SENSe:VOLTage:DC:APERture:ENABled {}"
apterture_time:
q: "SENSe:RES:APERture {}"
voltage_ac_aperture_time:
default: 0
getter:
q: "SENSe:VOLTage:DC:APERture?"
q: "SENSe:VOLT:AC:APERture?"
r: "{}"
setter:
q: "SENSe:VOLTage:DC:APERture {}"
autozero:
q: "SENSe:VOLT:AC:APERture {}"
voltage_dc_aperture_time:
default: 0
getter:
q: "SENSe:VOLTage:DC:ZERO:AUTO?"
q: "SENSe:VOLT:APERture?"
r: "{}"
setter:
q: "SENSe:VOLTage:DC:ZERO:AUTO {}"
q: "SENSe:VOLT:APERture {}"
licenses:
default: "DIG"
getter:
Expand Down
Loading
Loading