X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-dmm%2Fapi.c;h=1b62fb4385dcb11e045d10fcbf81379e16136f01;hb=a16198316fc68440783ad1040ac8ddd9b918e67b;hp=011f57b5c1806afcac4a793070953d4166fd6dab;hpb=31e65c62ecc25f91cb210258b61828558d6dcbca;p=libsigrok.git diff --git a/src/hardware/scpi-dmm/api.c b/src/hardware/scpi-dmm/api.c index 011f57b5..1b62fb43 100644 --- a/src/hardware/scpi-dmm/api.c +++ b/src/hardware/scpi-dmm/api.c @@ -31,7 +31,7 @@ static const uint32_t drvopts[] = { SR_CONF_MULTIMETER, }; -static const uint32_t devopts[] = { +static const uint32_t devopts_generic[] = { SR_CONF_CONTINUOUS, SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, @@ -49,13 +49,40 @@ static const struct scpi_command cmdset_agilent[] = { ALL_ZERO, }; -static const struct mqopt_item mqopts_agilent_5digit[] = { +/* + * cmdset_hp is used for the 34401A, which was added to this code after the + * 34405A and 34465A. It differs in starting the measurement with INIT: using + * MEAS without a trailing '?' (as used for the 34405A) is not valid for the + * 34401A and gives an error. + * I'm surprised the same instruction sequence doesn't work and INIT may + * work for both, but I don't have the others to re-test. + * + * On the 34401A, + * MEAS ? configures, arms, triggers and waits + * for a reading + * CONF configures + * INIT prepares for triggering (trigger mode is not set, assumed + * internal - external might time out) + * *OPC waits for completion, and + * READ? retrieves the result + */ +static const struct scpi_command cmdset_hp[] = { + { DMM_CMD_SETUP_REMOTE, "\n", }, + { DMM_CMD_SETUP_FUNC, "CONF:%s", }, + { DMM_CMD_QUERY_FUNC, "CONF?", }, + { DMM_CMD_START_ACQ, "INIT", }, + { DMM_CMD_STOP_ACQ, "ABORT", }, + { DMM_CMD_QUERY_VALUE, "READ?", }, + { DMM_CMD_QUERY_PREC, "CONF?", }, + ALL_ZERO, +}; + +static const struct mqopt_item mqopts_agilent_34405a[] = { { SR_MQ_VOLTAGE, SR_MQFLAG_DC, "VOLT:DC", "VOLT ", NO_DFLT_PREC, }, { SR_MQ_VOLTAGE, SR_MQFLAG_AC, "VOLT:AC", "VOLT:AC ", NO_DFLT_PREC, }, { SR_MQ_CURRENT, SR_MQFLAG_DC, "CURR:DC", "CURR ", NO_DFLT_PREC, }, { SR_MQ_CURRENT, SR_MQFLAG_AC, "CURR:AC", "CURR:AC ", NO_DFLT_PREC, }, { SR_MQ_RESISTANCE, 0, "RES", "RES ", NO_DFLT_PREC, }, - { SR_MQ_RESISTANCE, SR_MQFLAG_FOUR_WIRE, "FRES", "FRES ", NO_DFLT_PREC, }, { SR_MQ_CONTINUITY, 0, "CONT", "CONT", -1, }, { SR_MQ_CAPACITANCE, 0, "CAP", "CAP ", NO_DFLT_PREC, }, { SR_MQ_VOLTAGE, SR_MQFLAG_DC | SR_MQFLAG_DIODE, "DIOD", "DIOD", -4, }, @@ -63,11 +90,41 @@ static const struct mqopt_item mqopts_agilent_5digit[] = { { SR_MQ_FREQUENCY, 0, "FREQ", "FREQ ", NO_DFLT_PREC, }, }; +static const struct mqopt_item mqopts_agilent_34401a[] = { + { SR_MQ_VOLTAGE, SR_MQFLAG_DC, "VOLT:DC", "VOLT ", NO_DFLT_PREC, }, + { SR_MQ_VOLTAGE, SR_MQFLAG_AC, "VOLT:AC", "VOLT:AC ", NO_DFLT_PREC, }, + { SR_MQ_CURRENT, SR_MQFLAG_DC, "CURR:DC", "CURR ", NO_DFLT_PREC, }, + { SR_MQ_CURRENT, SR_MQFLAG_AC, "CURR:AC", "CURR:AC ", NO_DFLT_PREC, }, + { SR_MQ_RESISTANCE, 0, "RES", "RES ", NO_DFLT_PREC, }, + { SR_MQ_RESISTANCE, SR_MQFLAG_FOUR_WIRE, "FRES", "FRES ", NO_DFLT_PREC, }, + { SR_MQ_CONTINUITY, 0, "CONT", "CONT", -1, }, + { SR_MQ_VOLTAGE, SR_MQFLAG_DC | SR_MQFLAG_DIODE, "DIOD", "DIOD", -4, }, + { SR_MQ_FREQUENCY, 0, "FREQ", "FREQ ", NO_DFLT_PREC, }, + { SR_MQ_TIME, 0, "PER", "PER ", NO_DFLT_PREC, }, +}; + SR_PRIV const struct scpi_dmm_model models[] = { { "Agilent", "34405A", - 1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_5digit), + 1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a), scpi_dmm_get_meas_agilent, + ARRAY_AND_SIZE(devopts_generic), + 0, + }, + { + "Keysight", "34465A", + 1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a), + scpi_dmm_get_meas_agilent, + ARRAY_AND_SIZE(devopts_generic), + 0, + }, + { + "HP", "34401A", + 1, 6, cmdset_hp, ARRAY_AND_SIZE(mqopts_agilent_34401a), + scpi_dmm_get_meas_agilent, + ARRAY_AND_SIZE(devopts_generic), + /* 34401A: typ. 1020ms for AC readings (default is 1000ms). */ + 1000 * 1500, }, }; @@ -101,8 +158,8 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) size_t i; gchar *channel_name; - ret = sr_scpi_get_hw_id(scpi, &hw_info); scpi_dmm_cmd_delay(scpi); + ret = sr_scpi_get_hw_id(scpi, &hw_info); if (ret != SR_OK) { sr_info("Could not get IDN response."); return NULL; @@ -123,7 +180,8 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) sdi->driver = &scpi_dmm_driver_info; sdi->inst_type = SR_INST_SCPI; 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 = g_malloc0(sizeof(*devc)); sdi->priv = devc; devc->num_channels = model->num_channels; @@ -191,7 +249,7 @@ static int config_get(uint32_t key, GVariant **data, case SR_CONF_LIMIT_MSEC: return sr_sw_limits_config_get(&devc->limits, key, data); case SR_CONF_MEASURED_QUANTITY: - ret = scpi_dmm_get_mq(sdi, &mq, &mqflag, NULL); + ret = scpi_dmm_get_mq(sdi, &mq, &mqflag, NULL, NULL); if (ret != SR_OK) return ret; arr[0] = g_variant_new_uint32(mq); @@ -246,7 +304,12 @@ static int config_list(uint32_t key, GVariant **data, switch (key) { case SR_CONF_SCAN_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: /* TODO Use std_gvar_measured_quantities() when available. */ if (!devc) @@ -271,20 +334,21 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) struct sr_scpi_dev_inst *scpi; struct dev_context *devc; int ret; + const struct mqopt_item *item; const char *command; scpi = sdi->conn; devc = sdi->priv; ret = scpi_dmm_get_mq(sdi, &devc->start_acq_mq.curr_mq, - &devc->start_acq_mq.curr_mqflag, NULL); + &devc->start_acq_mq.curr_mqflag, NULL, &item); if (ret != SR_OK) return ret; command = sr_scpi_cmd_get(devc->cmdset, DMM_CMD_START_ACQ); if (command && *command) { - ret = sr_scpi_send(scpi, command); scpi_dmm_cmd_delay(scpi); + ret = sr_scpi_send(scpi, command); if (ret != SR_OK) return ret; } @@ -313,8 +377,8 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) command = sr_scpi_cmd_get(devc->cmdset, DMM_CMD_STOP_ACQ); if (command && *command) { - (void)sr_scpi_send(scpi, command); scpi_dmm_cmd_delay(scpi); + (void)sr_scpi_send(scpi, command); } sr_scpi_source_remove(sdi->session, scpi);