ols: remove needless initialization

[libsigrok.git] / src / hardware / scpi-dmm / api.c

diff --git a/src/hardware/scpi-dmm/api.c b/src/hardware/scpi-dmm/api.c
index 0bb5bcba6418eda8ac9bcdfd451e7cde33974ab0..7bb134c645cdd92f8f3b7bc94dd74f37ee30a498 100644 (file)
--- a/src/hardware/scpi-dmm/api.c
+++ b/src/hardware/scpi-dmm/api.c
@@ -69,6 +69,12 @@ SR_PRIV const struct scpi_dmm_model models[] = {
                scpi_dmm_get_meas_agilent,
                ARRAY_AND_SIZE(devopts_generic),
        },
+       {
+               "Keysight", "34465A",
+               1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a),
+               scpi_dmm_get_meas_agilent,
+               ARRAY_AND_SIZE(devopts_generic),
+       },
 };
 
 static const struct scpi_dmm_model *is_compatible(const char *vendor, const char *model)
@@ -101,8 +107,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;
@@ -289,8 +295,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
        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;
        }
@@ -319,8 +325,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);