Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
67c3110
Add missing commands to pyvisa-sim file and rename properties for cla…
Oct 30, 2025
02e02ce
Bypass blocking function in blocking_t if in simulated mode
Oct 30, 2025
3544760
Fix issues with pyvisa-sim yaml setters/getters
Oct 31, 2025
a8960fa
Update logic to bypass wait loop when setting blocking_t in sim mode.
Oct 31, 2025
7b8b98a
Fix bug where channel name was not being parsed correctly.
Oct 31, 2025
461ad88
Use pyvisa-sim yaml for testing instead of mocked class
Oct 31, 2025
968c0f4
Enhance pyvisa-sim yaml for better simulation experience
Oct 31, 2025
79ab49d
Use pyvisa-sim instead of special mock class.
Oct 31, 2025
b1d01b0
Merge branch 'main' into tlemon/fix-lakeshore-pyvisa-sim-yaml
trlemon Nov 3, 2025
590c31f
Improve pyvisa-sim yaml for lakeshore model 335
Nov 3, 2025
decb90c
Update Lakeshore335 tests to use pyvisa-sim backend instead of mocked…
Nov 3, 2025
277a457
Update lakeshore 336 legacy tests to use new pyvisa-sim file.
Nov 3, 2025
ac0e828
Replace LakeshoreModel372Mock with LakeshoreModel372 to fix failing test
Nov 3, 2025
d6c1420
Add newsfragment
Nov 3, 2025
d27441e
Use yield in test fixtures for Lakeshore Models 335 and 336 legacy
Nov 4, 2025
d4b2c1a
Merge branch 'main' into tlemon/fix-lakeshore-pyvisa-sim-yaml
trlemon Nov 4, 2025
c9679ff
Remove "SIMTEMP" cmd from Lakeshore sim yamls and remove is_simulated…
Nov 4, 2025
5aeedac
Revert back to using LakeshoreModel372Mock.
Nov 4, 2025
5d027b9
Revert to using mocked Lakeshore class but remove queries and command…
Nov 4, 2025
953c5a6
Remove duplicate variables.
Nov 6, 2025
f05643b
Add missing KRDG? query.
Nov 6, 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
3 changes: 3 additions & 0 deletions docs/changes/newsfragments/7606.improved
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Improved pyvisa-sim YAMLs for Lakeshore Models 335, 336, and 372.
- Updated Lakeshore tests to use pyvisa-sim backend instead of mocked classes.
- Updated lakeshore_base.py to bypass waiting when using blocking_t in sim mode.
168 changes: 160 additions & 8 deletions src/qcodes/instrument/sims/lakeshore_model335.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,37 @@ devices:
setter:
q: "INNAME A,\"{}\""

sensor_tlimit_A:
default: "300.0"
getter:
q: "TLIMIT? A"
r: "{}"
setter:
q: "TLIMIT A,{}"

sensor_type_A:
default: "1,0,1,0,1"
getter:
q: "INTYPE? A"
r: "{}"
setter:
q: "INTYPE A,{}"

sensor_setpoint_A:
default: "100"
getter:
q: "setp? A"
q: "SETP? A"
r: "{}"
setter:
q: "setp A,\"{}\""
q: "SETP A,\"{}\""

sensor_range_A:
default: "1"
getter:
q: "range? A"
q: "RANGE? A"
r: "{}"
setter:
q: "range A,\"{}\""
q: "RANGE A,\"{}\""


temperature_B:
Expand Down Expand Up @@ -80,21 +96,157 @@ devices:
setter:
q: "INNAME B,\"{}\""

sensor_tlimit_B:
default: "300.0"
getter:
q: "TLIMIT? B"
r: "{}"
setter:
q: "TLIMIT B,{}"

sensor_type_B:
default: "1,0,1,0,1"
getter:
q: "INTYPE? B"
r: "{}"
setter:
q: "INTYPE B,{}"

sensor_setpoint_B:
default: "100"
getter:
q: "setp? A"
q: "SETP? B"
r: "{}"
setter:
q: "setp A,\"{}\""
q: "SETP B,\"{}\""

sensor_range_B:
default: "1"
getter:
q: "range? A"
q: "RANGE? B"
r: "{}"
setter:
q: "RANGE B,\"{}\""

output_mode_1:
default: "1,1,0"
getter:
q: "OUTMODE? 1"
r: "{}"
setter:
q: "OUTMODE 1,{}"

output_mode_2:
default: "1,2,0"
getter:
q: "OUTMODE? 2"
r: "{}"
setter:
q: "OUTMODE 2,{}"

pid_output_1:
default: "10,20,30"
getter:
q: "PID? 1"
r: "{}"
setter:
q: "PID 1,{}"

pid_output_2:
default: "10,20,30"
getter:
q: "PID? 2"
r: "{}"
setter:
q: "PID 2,{}"

output_range_1:
default: "1"
getter:
q: "RANGE? 1"
r: "{}"
setter:
q: "RANGE 1,{}"

output_range_2:
default: "1"
getter:
q: "RANGE? 2"
r: "{}"
setter:
q: "RANGE 2,{}"

heater_output_1:
default: "0.0"
getter:
q: "HTR? 1"
r: "{}"

heater_output_2:
default: "0.0"
getter:
q: "HTR? 2"
r: "{}"

output_setpoint_1:
default: "100.0"
getter:
q: "SETP? 1"
r: "{}"
setter:
q: "SETP 1,{}"

output_setpoint_2:
default: "100.0"
getter:
q: "SETP? 2"
r: "{}"
setter:
q: "range A,\"{}\""
q: "SETP 2,{}"

heater_setup_1:
default: "0,1,0,0.0,1"
getter:
q: "HTRSET? 1"
r: "{}"
setter:
q: "HTRSET 1,{}"

heater_setup_2:
default: "0,1,0,0.0,1"
getter:
q: "HTRSET? 2"
r: "{}"
setter:
q: "HTRSET 2,{}"

setpoint_ramp_1:
default: "0,0.0"
getter:
q: "RAMP? 1"
r: "{}"
setter:
q: "RAMP 1,{}"

setpoint_ramp_2:
default: "0,0.0"
getter:
q: "RAMP? 2"
r: "{}"
setter:
q: "RAMP 2,{}"

setpoint_ramp_status_1:
default: "0"
getter:
q: "RAMPST? 1"
r: "{}"

setpoint_ramp_status_2:
default: "0"
getter:
q: "RAMPST? 2"
r: "{}"


resources:
Expand Down
Loading
Loading