rigol-ds: DS1000 series still needs the stupid delay.

diff --git a/hardware/rigol-ds/api.c b/hardware/rigol-ds/api.c
index 087cc9a53120d19937e59f0c0104811e8a9bd44d..4019316020c93ee5d0a97771d4d0c0c1f6765789 100644 (file)
--- a/hardware/rigol-ds/api.c
+++ b/hardware/rigol-ds/api.c
@@ -225,6 +225,7 @@ static int dev_clear(void)
 
 static int set_cfg(const struct sr_dev_inst *sdi, const char *format, ...)
 {
+       struct dev_context *devc = sdi->priv;
        va_list args;
        int ret;
 
@@ -235,7 +236,14 @@ static int set_cfg(const struct sr_dev_inst *sdi, const char *format, ...)
        if (ret != SR_OK)
                return SR_ERR;
 
-       return sr_scpi_get_opc(sdi->conn);
+       if (devc->model->series == RIGOL_DS1000) {
+               /* The DS1000 series needs this stupid delay, *OPC? doesn't work. */
+               sr_spew("delay %dms", 100);
+               g_usleep(100000);
+               return SR_OK;
+       } else {
+               return sr_scpi_get_opc(sdi->conn);
+       }
 }
 
 static int init(struct sr_context *sr_ctx)