From: Martin Ling <redacted>
Date: Fri, 17 Jan 2014 14:22:09 +0000 (+0000)
Subject: rigol-ds: Use *OPC? command rather than delay to await completion.
X-Git-Tag: libsigrok-0.3.0~234
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=51bfe5363a89f7547810ed02868207a6f6be35b5;p=libsigrok.git

rigol-ds: Use *OPC? command rather than delay to await completion.
---

diff --git a/hardware/rigol-ds/api.c b/hardware/rigol-ds/api.c
index 2b86e7d2..04196a46 100644
--- a/hardware/rigol-ds/api.c
+++ b/hardware/rigol-ds/api.c
@@ -231,12 +231,7 @@ static int set_cfg(const struct sr_dev_inst *sdi, const char *format, ...)
 	if (ret != SR_OK)
 		return SR_ERR;
 
-	/* When setting a bunch of parameters in a row, the DS1052E scrambles
-	 * some of them unless there is at least 100ms delay in between. */
-	sr_spew("delay %dms", 100);
-	g_usleep(100000);
-
-	return SR_OK;
+	return sr_scpi_get_opc(sdi->conn);
 }
 
 static int init(struct sr_context *sr_ctx)