From 10d309c8abe03fa242409a6db398b4705cf6cf3d Mon Sep 17 00:00:00 2001 From: Martin Ling Date: Tue, 21 Jan 2014 02:23:38 +0000 Subject: [PATCH] rigol-ds: DS1000 series still needs the stupid delay. --- hardware/rigol-ds/api.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hardware/rigol-ds/api.c b/hardware/rigol-ds/api.c index 087cc9a5..40193160 100644 --- 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)