BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scpi-dmm: add support for model specific device options 

Supported SCPI DMM devices will differ in the set of options and whether
parameters can get queried or configured. Use a "generic" set of devopts
during scan and for simpler models, prepare support for other sets of
devopts for more complex models.
This commit is contained in:
Gerhard Sittig 2018-11-17 16:26:51 +01:00
parent 31e65c62ec
commit 1d2f9963ab
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hardware/scpi-dmm/api.c
View File

@ -31,7 +31,7 @@ static const uint32_t drvopts[] = {
SR_CONF_MULTIMETER, SR_CONF_MULTIMETER,
}; };
static const uint32_t devopts[] = { static const uint32_t devopts_generic[] = {
SR_CONF_CONTINUOUS, SR_CONF_CONTINUOUS,
SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
@ -68,6 +68,7 @@ SR_PRIV const struct scpi_dmm_model models[] = {
"Agilent", "34405A", "Agilent", "34405A",
1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_5digit), 1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_5digit),
scpi_dmm_get_meas_agilent, scpi_dmm_get_meas_agilent,
ARRAY_AND_SIZE(devopts_generic),
}, },
}; };
@ -246,7 +247,12 @@ static int config_list(uint32_t key, GVariant **data,
switch (key) { switch (key) {
case SR_CONF_SCAN_OPTIONS: case SR_CONF_SCAN_OPTIONS:
case SR_CONF_DEVICE_OPTIONS: case SR_CONF_DEVICE_OPTIONS:
return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts); if (!devc)
return STD_CONFIG_LIST(key, data, sdi, cg,
scanopts, drvopts, devopts_generic);
return std_opts_config_list(key, data, sdi, cg,
ARRAY_AND_SIZE(scanopts), ARRAY_AND_SIZE(drvopts),
devc->model->devopts, devc->model->devopts_size);
case SR_CONF_MEASURED_QUANTITY: case SR_CONF_MEASURED_QUANTITY:
/* TODO Use std_gvar_measured_quantities() when available. */ /* TODO Use std_gvar_measured_quantities() when available. */
if (!devc) if (!devc)

2
src/hardware/scpi-dmm/protocol.h
View File

@ -60,6 +60,8 @@ struct scpi_dmm_model {
const struct mqopt_item *mqopts; const struct mqopt_item *mqopts;
size_t mqopt_size; size_t mqopt_size;
int (*get_measurement)(const struct sr_dev_inst *sdi, size_t ch); int (*get_measurement)(const struct sr_dev_inst *sdi, size_t ch);
const uint32_t *devopts;
size_t devopts_size;
}; };
struct dev_context { struct dev_context {