BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rigol-ds: Select channels before issuing RUN command.

This commit is contained in:
Martin Ling 2013-12-27 23:13:21 +01:00 committed by Bert Vermeulen
parent 48460c6f3e
commit 1fed20cb38
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hardware/rigol-ds/api.c
View File

@ -790,19 +790,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
scpi = sdi->conn; scpi = sdi->conn;
devc = sdi->priv; devc = sdi->priv;
if (devc->data_source == DATA_SOURCE_LIVE) {
if (sr_scpi_send(sdi->conn, ":RUN") != SR_OK)
return SR_ERR;
} else if (devc->data_source == DATA_SOURCE_MEMORY) {
if (devc->model->series != RIGOL_DS2000) {
sr_err("Data source 'Memory' not supported for this device");
return SR_ERR;
}
} else if (devc->data_source == DATA_SOURCE_SEGMENTED) {
sr_err("Data source 'Segmented' not yet supported");
return SR_ERR;
}
for (l = sdi->probes; l; l = l->next) { for (l = sdi->probes; l; l = l->next) {
probe = l->data; probe = l->data;
sr_dbg("handling probe %s", probe->name); sr_dbg("handling probe %s", probe->name);
@ -830,9 +817,23 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
} }
} }
} }
if (!devc->enabled_analog_probes && !devc->enabled_digital_probes) if (!devc->enabled_analog_probes && !devc->enabled_digital_probes)
return SR_ERR; return SR_ERR;
if (devc->data_source == DATA_SOURCE_LIVE) {
if (sr_scpi_send(sdi->conn, ":RUN") != SR_OK)
return SR_ERR;
} else if (devc->data_source == DATA_SOURCE_MEMORY) {
if (devc->model->series != RIGOL_DS2000) {
sr_err("Data source 'Memory' not supported for this device");
return SR_ERR;
}
} else if (devc->data_source == DATA_SOURCE_SEGMENTED) {
sr_err("Data source 'Segmented' not yet supported");
return SR_ERR;
}
sr_scpi_source_add(scpi, G_IO_IN, 50, rigol_ds_receive, (void *)sdi); sr_scpi_source_add(scpi, G_IO_IN, 50, rigol_ds_receive, (void *)sdi);
/* Send header packet to the session bus. */ /* Send header packet to the session bus. */