norma-dmm: Added request timeout mechanism; docs.

[libsigrok.git] / hardware / rigol-ds / api.c

diff --git a/hardware/rigol-ds/api.c b/hardware/rigol-ds/api.c
index 4d49be0b5da9c64a6cf1f484cd47f35e05096207..465001048ac5af4a93c87d6db478a35f86140467 100644 (file)
--- a/hardware/rigol-ds/api.c
+++ b/hardware/rigol-ds/api.c
@@ -272,8 +272,13 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
        gchar *channel_name, **version;
 
        if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
-               sr_info("Couldn't get IDN response.");
-               return NULL;
+               sr_info("Couldn't get IDN response, retrying.");
+               sr_scpi_close(scpi);
+               sr_scpi_open(scpi);
+               if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
+                       sr_info("Couldn't get IDN response.");
+                       return NULL;
+               }
        }
 
        for (i = 0; i < ARRAY_SIZE(supported_models); i++) {
@@ -942,7 +947,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
        switch (devc->model->series->protocol) {
        case PROTOCOL_V2:
-               if (rigol_ds_config_set(sdi, ":ACQ:MDEP LONG") != SR_OK)
+               if (rigol_ds_config_set(sdi, ":ACQ:MEMD LONG") != SR_OK)
                        return SR_ERR;
                break;
        case PROTOCOL_V3: