X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fprotocol.c;h=a533f12a1f12451d8acd609ccd407ab8bb0f9cf3;hb=76f712a73f3213a7ec0a38e38302cf2f04f48976;hp=8e12990173dbe8e5e95c82122e127c534fd5c499;hpb=55bece00aae2a53a0e25a685ee3ca111dc29fd12;p=libsigrok.git

diff --git a/src/hardware/rigol-ds/protocol.c b/src/hardware/rigol-ds/protocol.c
index 8e129901..a533f12a 100644
--- a/src/hardware/rigol-ds/protocol.c
+++ b/src/hardware/rigol-ds/protocol.c
@@ -337,8 +337,12 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi)
 	if (!(devc = sdi->priv))
 		return SR_ERR;
 
-	sr_dbg("Starting data capture for frameset %" PRIu64 " of %" PRIu64,
-	       devc->num_frames + 1, devc->limit_frames);
+	if (devc->limit_frames == 0)
+		sr_dbg("Starting data capture for frameset %" PRIu64,
+		       devc->num_frames + 1);
+	else
+		sr_dbg("Starting data capture for frameset %" PRIu64 " of %"
+		       PRIu64, devc->num_frames + 1, devc->limit_frames);
 
 	switch (devc->model->series->protocol) {
 	case PROTOCOL_V1:
@@ -879,7 +883,8 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
 	sr_dbg("Current trigger source %s", devc->trigger_source);
 
 	/* Horizontal trigger position. */
-	if (sr_scpi_get_float(sdi->conn, ":TIM:OFFS?", &devc->horiz_triggerpos) != SR_OK)
+	if (sr_scpi_get_float(sdi->conn, devc->model->cmds[CMD_GET_HORIZ_TRIGGERPOS].str,
+			&devc->horiz_triggerpos) != SR_OK)
 		return SR_ERR;
 	sr_dbg("Current horizontal trigger position %g", devc->horiz_triggerpos);