Add types to generic instrument parameteres

src/qcodes/instrument/sims/Agilent_E8267C.yaml

@@ -0,0 +1,41 @@
+spec: "1.0"
+devices:
+  device 1:
+    eom:
+      GPIB INSTR:
+        q: "\n"
+        r: "\n"
+    error: ERROR
+    dialogues:
+      - q: "*IDN?"
+        r: "Agilent Technologies, E8267C, US00000000, C.04.84"
+
+    properties:
+      power:
+        default: 0
+        getter:
+          q: "POW?"
+          r: "{}"
+        setter:
+          q: "POW {}"
+
+      power_offset:
+        default: 0
+        getter:
+          q: "POW:OFFS?"
+          r: "{}"
+        setter:
+          q: "POW:OFFS {}"
+
+      pulse_width:
+        # *RST value according to the E8257D/67D SCPI command reference
+        default: "+1.00000000E-006"
+        getter:
+          q: "PULM:INT:PWID?"
+          r: "{}"
+        setter:
+          q: "PULM:INT:PWID {}"
+
+resources:
+  GPIB::1::INSTR:
+    device: device 1

src/qcodes/instrument/sims/Keithley_2450.yaml

@@ -67,6 +67,42 @@ devices:
         setter:
           q: "TRACe:CLEar"
 
+      sense_count:
+        default: 1
+        getter:
+          q: ":SENSe:COUNt?"
+          r: "{}"
+        setter:
+          q: ":SENSe:COUNt {}"
+        specs:
+          type: int
+
+      line_frequency:
+        default: "5.000000E+01"
+        getter:
+          q: ":SYSTem:LFRequency?"
+          r: "{}"
+
+      sense_current_nplc:
+        default: 1
+        getter:
+          q: ":SENSe:current:NPLCycles?"
+          r: "{}"
+        setter:
+          q: ":SENSe:current:NPLCycles {}"
+        specs:
+          type: float
+
+      source_current_delay:
+        default: 0
+        getter:
+          q: ":SOURce:current:DELay?"
+          r: "{}"
+        setter:
+          q: ":SOURce:current:DELay {}"
+        specs:
+          type: float
+
 resources:
   GPIB::1::INSTR:
     device: device wrong_mode

src/qcodes/instrument/sims/Keithley_6500.yaml

@@ -0,0 +1,38 @@
+spec: "1.0"
+devices:
+  device 1:
+    eom:
+      GPIB INSTR:
+        q: "\n"
+        r: "\n"
+    error: ERROR
+    dialogues:
+      - q: "*IDN?"
+        r: "KEITHLEY INSTRUMENTS,MODEL DMM6500,04000000,1.0.0"
+      - q: "*LANG?"
+        r: "SCPI"
+
+    properties:
+      data_format:
+        default: ASCII
+        getter:
+          q: "FORM:DATA?"
+          r: "{}"
+        setter:
+          q: "FORM:DATA {}"
+
+      display_digits:
+        default: 6
+        getter:
+          q: "DISP:VOLT:DC:DIG?"
+          r: "{}"
+        setter:
+          q: "DISP:VOLT:DC:DIG {}"
+        specs:
+          type: int
+          min: 4
+          max: 7
+
+resources:
+  GPIB::1::INSTR:
+    device: device 1

src/qcodes/instrument/sims/Keysight_E4980A.yaml

@@ -32,6 +32,23 @@ devices:
         setter:
           q: ":CURRent:LEVel {}"
 
+      impedance_range:
+        # preset value according to the E4980A/AL user's guide
+        default: "+1.00000E+02"
+        getter:
+          q: ":FUNCtion:IMPedance:RANGe?"
+          r: "{}"
+        setter:
+          q: ":FUNCtion:IMPedance:RANGe {}"
+
+      impedance_autorange:
+        default: 1
+        getter:
+          q: ":FUNCtion:IMPedance:RANGe:AUTO?"
+          r: "{}"
+        setter:
+          q: ":FUNCtion:IMPedance:RANGe:AUTO {}"
+
 resources:
   GPIB::1::INSTR:
     device: device 1

src/qcodes/instrument/sims/RTO_1000.yaml

@@ -25,7 +25,7 @@ devices:
           q: "TRIGger1:SOURce?"
           r: "{}"
         setter:
-          q: "TRIGger1:SOURce? {}"
+          q: "TRIGger1:SOURce {}"
 
       trigger level 1:
         default: 0
@@ -35,6 +35,14 @@ devices:
         setter:
           q: "TRIGger1:LEVel1 {}"
 
+      trigger mode:
+        default: AUTO
+        getter:
+          q: "TRIGger:MODE?"
+          r: "{}"
+        setter:
+          q: "TRIGger:MODE {}"
+
       channel range 1:
         default: 5
         getter:
@@ -49,6 +57,15 @@ devices:
         setter:
           q: "CHANnel1:OFFSet {}"
 
+      channel impedance 1:
+        # *RST value according to the R&S RTO user manual
+        default: 50
+        getter:
+          q: "CHANnel1:IMPedance?"
+          r: "{}"
+        setter:
+          q: "CHANnel1:IMPedance {}"
+
 resources:
   GPIB::1::INSTR:
     device: device 1

src/qcodes/instrument/sims/Rigol_DG1062.yaml

@@ -0,0 +1,54 @@
+spec: "1.0"
+devices:
+  device 1:
+    eom:
+      GPIB INSTR:
+        q: "\n"
+        r: "\n"
+    error: ERROR
+    dialogues:
+      - q: "*IDN?"
+        r: "Rigol Technologies,DG1062Z,DG1ZA000000001,00.01.14"
+      - q: ":SOUR1:APPL?"
+        r: "\"SQU,1.000000E+03,5.000000E+00,0.000000E+00,0.000000E+00\""
+      - q: ":SOUR2:APPL?"
+        r: "\"SIN,1.000000E+03,5.000000E+00,0.000000E+00,0.000000E+00\""
+
+    # query responses use the scientific notation documented in the
+    # DG1000Z Programming Guide
+    properties:
+      burst_ncycles_1:
+        default: "1.000000E+00"
+        getter:
+          q: ":SOUR1:BURS:NCYC?"
+          r: "{}"
+        setter:
+          q: ":SOUR1:BURS:NCYC {}"
+
+      burst_phase_1:
+        default: "0.000000E+00"
+        getter:
+          q: ":SOUR1:BURS:PHAS?"
+          r: "{}"
+        setter:
+          q: ":SOUR1:BURS:PHAS {}"
+
+      burst_time_delay_1:
+        default: "0.000000E+00"
+        getter:
+          q: ":SOUR1:BURS:TDEL?"
+          r: "{}"
+        setter:
+          q: ":SOUR1:BURS:TDEL {}"
+
+      square_duty_cycle_1:
+        default: "5.000000E+01"
+        getter:
+          q: ":SOUR1:FUNC:SQU:DCYC?"
+          r: "{}"
+        setter:
+          q: ":SOUR1:FUNC:SQU:DCYC {}"
+
+resources:
+  GPIB::1::INSTR:
+    device: device 1

src/qcodes/instrument/sims/Rigol_DS1074Z.yaml

@@ -46,6 +46,14 @@ devices:
           r: "{}"
         setter:
           q: ":TRIGger:MODE {}"
+      trigger_edge_level:
+        # response format from the MSO1000Z/DS1000Z Programming Guide
+        default: "1.600000e-01"
+        getter:
+          q: ":TRIGger:edge:LEVel?"
+          r: "{}"
+        setter:
+          q: ":TRIGger:edge:LEVel {}"
       data_source:
         default: "CHAN1"
         getter:

src/qcodes/instrument/sims/Rigol_DS4000.yaml

@@ -0,0 +1,27 @@
+spec: "1.0"
+devices:
+  device 1:
+    eom:
+      GPIB INSTR:
+        q: "\n"
+        r: "\n"
+    error: ERROR
+    dialogues:
+      - q: "*IDN?"
+        r: "RIGOL TECHNOLOGIES,DS4024,DS4A000000001,00.02.03"
+
+    properties:
+      enable_auto_scale:
+        default: 1
+        getter:
+          q: ":SYSTem:AUToscale?"
+          r: "{}"
+        setter:
+          q: ":SYSTem:AUToscale {}"
+        specs:
+          type: int
+          valid: [0, 1]
+
+resources:
+  GPIB::1::INSTR:
+    device: device 1

src/qcodes/instrument/sims/Rohde_Schwarz_ZNB20.yaml

@@ -0,0 +1,99 @@
+# SIMULATED INSTRUMENT FOR Rohde&Schwarz ZNB20
+# Only covers what is needed to create the driver with
+# init_s_params=False and reset_channels=False and add a single channel.
+# Commands that are only written are modelled as properties with a setter
+# without a response, so that they do not leave a reply in the read buffer.
+spec: "1.0"
+devices:
+  ZNB20:
+    eom:
+      TCPIP INSTR:
+        q: "\n"
+        r: "\n"
+    error: ERROR
+    dialogues:
+      - q: "*IDN?"
+        r: "Rohde-Schwarz,ZNB20-2Port,1311601062100104,3.12"
+      - q: "INST:PORT:COUN?"
+        r: "2"
+      - q: "SENS1:SWE:TIME?"
+        r: "0.0201"
+
+    properties:
+
+      display_update:
+        default: "ON"
+        setter:
+          q: "SYST:DISP:UPD {}"
+
+      trace_definition:
+        default: ""
+        setter:
+          q: "CALC1:PAR:SDEF {}"
+
+      # the driver sends "DISP:LAY GRID;:DISP:LAY:GRID r,c", which the
+      # simulator splits at the ";" into two commands
+      display_layout:
+        default: "GRID"
+        setter:
+          q: "DISP:LAY {}"
+
+      display_layout_grid:
+        default: "1,1"
+        setter:
+          q: ":DISP:LAY:GRID {}"
+
+      sweep_time_auto:
+        default: "ON"
+        setter:
+          q: "SENS1:SWE:TIME:AUTO {}"
+
+      trigger_source:
+        default: "IMM"
+        setter:
+          q: "TRIG1:SEQ:SOUR {}"
+
+      averaging:
+        default: "ON"
+        setter:
+          q: "SENS1:AVER:STAT {}"
+
+      start:
+        default: 100e3
+        getter:
+          q: "SENS1:FREQ:START?"
+          r: "{}"
+
+      stop:
+        default: 20e9
+        getter:
+          q: "SENS1:FREQ:STOP?"
+          r: "{}"
+
+      npts:
+        default: 201
+        getter:
+          q: "SENS1:SWE:POIN?"
+          r: "{}"
+
+      sweep_type:
+        default: "LIN"
+        getter:
+          q: "SENS1:SWE:TYPE?"
+          r: "{}"
+        setter:
+          q: "SENS1:SWE:TYPE {}"
+
+      bandwidth:
+        # *RST value is 10 kHz. The value is returned as it was sent, so
+        # after setting 1.5 Hz the instrument returns a non-integer string.
+        default: "10000"
+        getter:
+          q: "SENS1:BAND?"
+          r: "{}"
+        setter:
+          q: "SENS1:BAND {}"
+
+resources:
+  TCPIP0::localhost::inst0::INSTR:
+    device: ZNB20