diff --git a/site_ansto/instrument/config/environment/keysight_N8740A.sct b/site_ansto/instrument/config/environment/keysight_N8740A.sct index ace82c77..07d5c3d3 100644 --- a/site_ansto/instrument/config/environment/keysight_N8740A.sct +++ b/site_ansto/instrument/config/environment/keysight_N8740A.sct @@ -6,50 +6,74 @@ driver keysight_N8740A = { simulation_group = environment_simulation group = { type = int; - var state = { + var output_enable = { readable = 2; read_command = 'OUTPUT:STATE?'; writeable = 1; write_command = 'OUTPUT:STATE '; allowed = '0,1'; } + type = float; + var amps = { + readable = 1; read_command = 'MEASURE:SCALAR:CURRENT:DC?'; + units = 'A'; + } + var volts = { + readable = 1; read_command = 'MEASURE:SCALAR:VOLTAGE:DC?'; + units = 'V'; + } + var setpoint = { + readable = 1; read_command = 'SOURCE:VOLTAGE?'; + writeable = 1; write_command = 'SOURCE:VOLTAGE '; + driveable = setpoint; + tolerance = 1; + lowerlimit = 0; upperlimit = 150; + units = 'V'; + } } group current = { type = float; - var sensor = { - readable = 1; read_command = 'MEASURE:CURRENT?'; - writeable = 1; read_command = 'MEASURE:CURRENT '; + var prot_enable = { + type = int; + readable = 1; read_command = 'SOURCE:CURRENT:PROTECTION:STATE?'; + writeable = 1; write_command = 'SOURCE:CURRENT:PROTECTION:STATE '; + allowed = '0,1'; } - var setpoint = { + var prot_limit = { readable = 1; read_command = 'SOURCE:CURRENT?'; - writeable = 1; read_command = 'SOURCE:CURRENT '; - } - var limit = { - readable = 1; read_command = 'SOURCE:CURRENT:PROTECTION?'; - writeable = 1; read_command = 'SOURCE:CURRENT:PROTECTION '; + writeable = 1; write_command = 'SOURCE:CURRENT '; + lowerlimit = 0; upperlimit = 22; + units = 'A'; } } group voltage = { type = float; - var sensor = { - readable = 1; read_command = 'MEASURE:VOLTAGE?'; - writeable = 1; read_command = 'MEASURE:VOLTAGE '; + var lolimit = { + readable = 1; read_command = 'SOURCE:VOLTAGE:LIMIT:LOW?'; + writeable = 1; write_command = 'SOURCE:VOLTAGE:LIMIT:LOW '; + units = 'V'; } - var setpoint = { - readable = 1; read_command = 'SOURCE:VOLTAGE?'; - writeable = 1; read_command = 'SOURCE:VOLTAGE '; - } - var limit = { + var hilimit = { readable = 1; read_command = 'SOURCE:VOLTAGE:PROTECTION?'; - writeable = 1; read_command = 'SOURCE:VOLTAGE:PROTECTION '; + writeable = 1; write_command = 'SOURCE:VOLTAGE:PROTECTION '; + lowerlimit = 0; upperlimit = 165; + units = 'V'; } } group system = { type = text; data = false; control = false; mutable = false; nxsave = false; + var ident = { + readable = 15; read_command = '*IDN?'; + } var error = { readable = 1; read_command = 'SYSTEM:ERROR?'; } var version = { - readable = 1; read_command = 'SYSTEM:VERSION?'; + readable = 15; read_command = 'SYSTEM:VERSION?'; } } + code setValue = { + @TCL + set cmd "${cmd_str}${par}@@NOREPLY@@" + @END + } }