static const uint32_t devopts_generic[] = {
SR_CONF_CONTINUOUS,
+ SR_CONF_CONN | SR_CONF_GET,
SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
SR_CONF_MEASURED_QUANTITY | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
{ DMM_CMD_SETUP_FUNC, "CONF:%s", },
{ DMM_CMD_QUERY_FUNC, "CONF:STAT:FUNC?", },
{ DMM_CMD_START_ACQ, "*CLS;SYST:REM", },
- { DMM_CMD_STOP_ACQ, "SYST:LOC", },
{ DMM_CMD_QUERY_VALUE, "VAL1?", },
{ DMM_CMD_QUERY_PREC, "SENS:DET:RATE?", },
ALL_ZERO,
{ DMM_CMD_SETUP_LOCAL, "SYST:LOC", },
{ DMM_CMD_SETUP_FUNC, "CONF:%s", },
{ DMM_CMD_QUERY_FUNC, "CONF?", },
- { DMM_CMD_START_ACQ, "*CLS;SYST:REM", },
- { DMM_CMD_STOP_ACQ, "SYST:LOC", },
+ { DMM_CMD_START_ACQ, "INIT", },
+ { DMM_CMD_STOP_ACQ, "ABORT", },
{ DMM_CMD_QUERY_VALUE, "VAL1?", },
{ DMM_CMD_QUERY_PREC, "SENS:DET:RATE?", },
ALL_ZERO,
1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a),
scpi_dmm_get_meas_agilent,
ARRAY_AND_SIZE(devopts_generic),
- 0,
+ 0, 0,
},
{
"Agilent", "34410A",
1, 6, cmdset_hp, ARRAY_AND_SIZE(mqopts_agilent_34405a),
scpi_dmm_get_meas_agilent,
ARRAY_AND_SIZE(devopts_generic),
- 0,
+ 0, 0,
},
{
"GW", "GDM8251A",
1, 6, cmdset_gwinstek, ARRAY_AND_SIZE(mqopts_gwinstek_gdm8200a),
scpi_dmm_get_meas_gwinstek,
ARRAY_AND_SIZE(devopts_generic),
- 1000 * 2500,
+ 1000 * 2500, 0,
},
{
"GW", "GDM8255A",
1, 6, cmdset_gwinstek, ARRAY_AND_SIZE(mqopts_gwinstek_gdm8200a),
scpi_dmm_get_meas_gwinstek,
ARRAY_AND_SIZE(devopts_generic),
- 1000 * 2500,
+ 1000 * 2500, 0,
},
{
"GWInstek", "GDM9060",
1, 6, cmdset_gwinstek_906x, ARRAY_AND_SIZE(mqopts_gwinstek_gdm906x),
scpi_dmm_get_meas_agilent,
ARRAY_AND_SIZE(devopts_generic),
- 0,
+ 0, 0,
},
{
"GWInstek", "GDM9061",
1, 6, cmdset_gwinstek_906x, ARRAY_AND_SIZE(mqopts_gwinstek_gdm906x),
scpi_dmm_get_meas_agilent,
ARRAY_AND_SIZE(devopts_generic),
- 0,
+ 0, 0,
},
{
"HP", "34401A",
scpi_dmm_get_meas_agilent,
ARRAY_AND_SIZE(devopts_generic),
/* 34401A: typ. 1020ms for AC readings (default is 1000ms). */
- 1000 * 1500,
+ 1000 * 1500, 0,
},
{
"Keysight", "34465A",
1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a),
scpi_dmm_get_meas_agilent,
ARRAY_AND_SIZE(devopts_generic),
- 0,
+ 0, 0,
},
};
sdi->conn = scpi;
sdi->driver = &scpi_dmm_driver_info;
sdi->inst_type = SR_INST_SCPI;
+ ret = sr_scpi_connection_id(scpi, &sdi->connection_id);
+ if (ret != SR_OK) {
+ g_free(sdi->connection_id);
+ sdi->connection_id = NULL;
+ }
sr_scpi_hw_info_free(hw_info);
if (model->read_timeout_us) /* non-default read timeout */
scpi->read_timeout_us = model->read_timeout_us;
devc = sdi->priv;
switch (key) {
+ case SR_CONF_CONN:
+ if (!sdi || !sdi->connection_id)
+ return SR_ERR_NA;
+ *data = g_variant_new_string(sdi->connection_id);
+ return SR_OK;
case SR_CONF_LIMIT_SAMPLES:
case SR_CONF_LIMIT_MSEC:
return sr_sw_limits_config_get(&devc->limits, key, data);