]> sigrok.org Git - libsigrok.git/commitdiff
rigol-ds: Fix an issue causing only one channel to be acquired.
authorUwe Hermann <redacted>
Sun, 22 Apr 2018 16:36:12 +0000 (18:36 +0200)
committerUwe Hermann <redacted>
Sun, 22 Apr 2018 16:36:12 +0000 (18:36 +0200)
This fixes bug #1018.

src/hardware/rigol-ds/protocol.c

index 453ab658edf21444fc85ba1caa751cd26dfdac4f..1344c8b420542398286f09b34f4c7345e15cd5ee 100644 (file)
@@ -723,7 +723,8 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
                        if (devc->data_source != DATA_SOURCE_LIVE)
                                rigol_ds_set_wait_event(devc, WAIT_BLOCK);
                }
-               if (!sr_scpi_read_complete(scpi)) {
+               /* End acquisition when data for all channels is acquired. */
+               if (!sr_scpi_read_complete(scpi) && !devc->channel_entry->next) {
                        sr_err("Read should have been completed");
                        packet.type = SR_DF_FRAME_END;
                        sr_session_send(sdi, &packet);