X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-dmm%2Fprotocol.c;h=d0cafd829f05d82463e1a91b8f388f65e76b3af8;hb=HEAD;hp=1a967358907099261627d4d364c032b6329027ac;hpb=b74cc88d328eb3b7d2c0c1df8fed84131815a9f3;p=libsigrok.git diff --git a/src/hardware/scpi-dmm/protocol.c b/src/hardware/scpi-dmm/protocol.c index 1a967358..a13db841 100644 --- a/src/hardware/scpi-dmm/protocol.c +++ b/src/hardware/scpi-dmm/protocol.c @@ -150,6 +150,8 @@ SR_PRIV int scpi_dmm_set_mq(const struct sr_dev_inst *sdi, ret = sr_scpi_send(sdi->conn, command, mode); if (ret != SR_OK) return ret; + if (item->drv_flags & FLAG_CONF_DELAY) + g_usleep(devc->model->conf_delay_us); return SR_OK; } @@ -241,6 +243,8 @@ SR_PRIV int scpi_dmm_set_range_from_text(const struct sr_dev_inst *sdi, item->scpi_func_setup, is_auto ? "AUTO" : range); if (ret != SR_OK) return ret; + if (item->drv_flags & FLAG_CONF_DELAY) + g_usleep(devc->model->conf_delay_us); return SR_OK; } @@ -392,7 +396,7 @@ SR_PRIV int scpi_dmm_get_meas_agilent(const struct sr_dev_inst *sdi, size_t ch) if (ret != SR_OK) return ret; g_strstrip(response); - use_double = devc->model->digits > 6; + use_double = devc->model->digits >= 6; ret = sr_atod_ascii(response, &info->d_value); if (ret != SR_OK) { g_free(response);