X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fscpi-dmm%2Fapi.c;h=520dc7068a7c11c647f159b49167587aa626ce5f;hp=0d3c6735de1824a2d64b638b2aa9d01dc85c863a;hb=d8064712ceff56145f6f2cee44abf6a76a22ca7e;hpb=ce96b696b548cc936ad50779b8b317db8bd421fc diff --git a/src/hardware/scpi-dmm/api.c b/src/hardware/scpi-dmm/api.c index 0d3c6735..520dc706 100644 --- a/src/hardware/scpi-dmm/api.c +++ b/src/hardware/scpi-dmm/api.c @@ -54,12 +54,11 @@ static const struct scpi_command cmdset_agilent[] = { { DMM_CMD_QUERY_FUNC, "CONF?", }, { DMM_CMD_START_ACQ, "INIT", }, { DMM_CMD_STOP_ACQ, "ABORT", }, - { DMM_CMD_QUERY_VALUE, "READ?", }, + { DMM_CMD_QUERY_VALUE, "FETCH?", }, { DMM_CMD_QUERY_PREC, "CONF?", }, { DMM_CMD_QUERY_RANGE_AUTO, "%s:RANGE:AUTO?", }, { DMM_CMD_QUERY_RANGE, "%s:RANGE?", }, - { DMM_CMD_SETUP_RANGE_AUTO, "%s:RANGE:AUTO ON", }, - { DMM_CMD_SETUP_RANGE, "%s:RANGE %s", }, + { DMM_CMD_SETUP_RANGE, "CONF:%s %s", }, ALL_ZERO, }; @@ -128,16 +127,16 @@ static const struct scpi_command cmdset_owon[] = { static const struct mqopt_item mqopts_agilent_34405a[] = { { SR_MQ_VOLTAGE, SR_MQFLAG_DC, "VOLT:DC", "VOLT ", NO_DFLT_PREC, FLAGS_NONE, }, - { SR_MQ_VOLTAGE, SR_MQFLAG_AC, "VOLT:AC", "VOLT:AC ", NO_DFLT_PREC, FLAGS_NONE, }, + { SR_MQ_VOLTAGE, SR_MQFLAG_AC, "VOLT:AC", "VOLT:AC ", NO_DFLT_PREC, FLAG_CONF_DELAY | FLAG_MEAS_DELAY, }, { SR_MQ_CURRENT, SR_MQFLAG_DC, "CURR:DC", "CURR ", NO_DFLT_PREC, FLAGS_NONE, }, - { SR_MQ_CURRENT, SR_MQFLAG_AC, "CURR:AC", "CURR:AC ", NO_DFLT_PREC, FLAGS_NONE, }, - { SR_MQ_RESISTANCE, 0, "RES", "RES ", NO_DFLT_PREC, FLAGS_NONE, }, - { SR_MQ_RESISTANCE, SR_MQFLAG_FOUR_WIRE, "FRES", "FRES ", NO_DFLT_PREC, FLAGS_NONE, }, - { SR_MQ_CONTINUITY, 0, "CONT", "CONT", -1, FLAGS_NONE, }, + { SR_MQ_CURRENT, SR_MQFLAG_AC, "CURR:AC", "CURR:AC ", NO_DFLT_PREC, FLAG_CONF_DELAY | FLAG_MEAS_DELAY, }, + { SR_MQ_RESISTANCE, 0, "RES", "RES ", NO_DFLT_PREC, FLAG_MEAS_DELAY, }, + { SR_MQ_RESISTANCE, SR_MQFLAG_FOUR_WIRE, "FRES", "FRES ", NO_DFLT_PREC, FLAG_MEAS_DELAY, }, + { SR_MQ_CONTINUITY, 0, "CONT", "CONT", -1, FLAG_NO_RANGE, }, { SR_MQ_CAPACITANCE, 0, "CAP", "CAP ", NO_DFLT_PREC, FLAGS_NONE, }, - { SR_MQ_VOLTAGE, SR_MQFLAG_DC | SR_MQFLAG_DIODE, "DIOD", "DIOD", -4, FLAGS_NONE, }, - { SR_MQ_TEMPERATURE, 0, "TEMP", "TEMP ", NO_DFLT_PREC, FLAGS_NONE, }, - { SR_MQ_FREQUENCY, 0, "FREQ", "FREQ ", NO_DFLT_PREC, FLAGS_NONE, }, + { SR_MQ_VOLTAGE, SR_MQFLAG_DC | SR_MQFLAG_DIODE, "DIOD", "DIOD", -4, FLAG_NO_RANGE, }, + { SR_MQ_TEMPERATURE, 0, "TEMP", "TEMP ", NO_DFLT_PREC, FLAG_NO_RANGE | FLAG_MEAS_DELAY, }, + { SR_MQ_FREQUENCY, 0, "FREQ", "FREQ ", NO_DFLT_PREC, FLAG_NO_RANGE | FLAG_MEAS_DELAY, }, }; static const struct mqopt_item mqopts_agilent_34401a[] = { @@ -205,7 +204,7 @@ SR_PRIV const struct scpi_dmm_model models[] = { 1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a), scpi_dmm_get_meas_agilent, ARRAY_AND_SIZE(devopts_generic_range), - 0, 0, FALSE, + 0, 200 * 1000, 2500 * 1000, 0, FALSE, scpi_dmm_get_range_text, scpi_dmm_set_range_from_text, NULL, }, { @@ -213,15 +212,23 @@ SR_PRIV const struct scpi_dmm_model models[] = { 1, 6, cmdset_hp, ARRAY_AND_SIZE(mqopts_agilent_34405a), scpi_dmm_get_meas_agilent, ARRAY_AND_SIZE(devopts_generic), - 0, 0, FALSE, + 0, 0, 0, 0, FALSE, NULL, NULL, NULL, }, + { + "Agilent", "34460A", + 1, 6, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a), + scpi_dmm_get_meas_agilent, + ARRAY_AND_SIZE(devopts_generic_range), + 0, 0, 10 * 1000, 0, FALSE, + scpi_dmm_get_range_text, scpi_dmm_set_range_from_text, NULL, + }, { "GW", "GDM8251A", 1, 6, cmdset_gwinstek, ARRAY_AND_SIZE(mqopts_gwinstek_gdm8200a), scpi_dmm_get_meas_gwinstek, ARRAY_AND_SIZE(devopts_generic), - 1000 * 2500, 0, FALSE, + 2500 * 1000, 0, 0, 0, FALSE, NULL, NULL, NULL, }, { @@ -229,7 +236,7 @@ SR_PRIV const struct scpi_dmm_model models[] = { 1, 6, cmdset_gwinstek, ARRAY_AND_SIZE(mqopts_gwinstek_gdm8200a), scpi_dmm_get_meas_gwinstek, ARRAY_AND_SIZE(devopts_generic), - 1000 * 2500, 0, FALSE, + 2500 * 1000, 0, 0, 0, FALSE, NULL, NULL, NULL, }, { @@ -237,7 +244,7 @@ SR_PRIV const struct scpi_dmm_model models[] = { 1, 6, cmdset_gwinstek_906x, ARRAY_AND_SIZE(mqopts_gwinstek_gdm906x), scpi_dmm_get_meas_agilent, ARRAY_AND_SIZE(devopts_generic), - 0, 0, FALSE, + 0, 0, 0, 0, FALSE, NULL, NULL, NULL, }, { @@ -245,7 +252,7 @@ SR_PRIV const struct scpi_dmm_model models[] = { 1, 6, cmdset_gwinstek_906x, ARRAY_AND_SIZE(mqopts_gwinstek_gdm906x), scpi_dmm_get_meas_agilent, ARRAY_AND_SIZE(devopts_generic), - 0, 0, FALSE, + 0, 0, 0, 0, FALSE, NULL, NULL, NULL, }, { @@ -254,7 +261,7 @@ SR_PRIV const struct scpi_dmm_model models[] = { scpi_dmm_get_meas_agilent, ARRAY_AND_SIZE(devopts_generic), /* 34401A: typ. 1020ms for AC readings (default is 1000ms). */ - 1000 * 1500, 0, FALSE, + 1500 * 1000, 0, 0, 0, FALSE, NULL, NULL, NULL, }, { @@ -262,7 +269,7 @@ SR_PRIV const struct scpi_dmm_model models[] = { 1, 6, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a), scpi_dmm_get_meas_agilent, ARRAY_AND_SIZE(devopts_generic_range), - 0, 0, FALSE, + 0, 0, 10 * 1000, 0, FALSE, scpi_dmm_get_range_text, scpi_dmm_set_range_from_text, NULL, }, { @@ -270,7 +277,7 @@ SR_PRIV const struct scpi_dmm_model models[] = { 1, 5, cmdset_owon, ARRAY_AND_SIZE(mqopts_owon_xdm2041), scpi_dmm_get_meas_gwinstek, ARRAY_AND_SIZE(devopts_generic), - 0, 1e9, TRUE, + 0, 0, 0, 1e9, TRUE, NULL, NULL, NULL, }, }; @@ -560,6 +567,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) const struct mqopt_item *item; const char *command; char *response; + gboolean do_mq_meas_delay; scpi = sdi->conn; devc = sdi->priv; @@ -596,6 +604,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) return ret; } + do_mq_meas_delay = item->drv_flags & FLAG_MEAS_DELAY; + if (do_mq_meas_delay && devc->model->meas_delay_us) + g_usleep(devc->model->meas_delay_us); + sr_sw_limits_acquisition_start(&devc->limits); ret = std_session_send_df_header(sdi); if (ret != SR_OK)