rigol-ds: Add support for reading segmented data for protocol v4

[libsigrok.git] / src / hardware / rigol-ds / protocol.c

diff --git a/src/hardware/rigol-ds/protocol.c b/src/hardware/rigol-ds/protocol.c
index 688dcc3998750909bbbe228c79590407faef8251..0628729a16396e39c7cd175abf43fe34f748fc64 100644 (file)
--- a/src/hardware/rigol-ds/protocol.c
+++ b/src/hardware/rigol-ds/protocol.c
@@ -338,12 +338,15 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi)
        if (!(devc = sdi->priv))
                return SR_ERR;
 
-       if (devc->limit_frames == 0)
+       uint64_t limit_frames = devc->limit_frames;
+       if (devc->num_frames_segmented != 0 && devc->num_frames_segmented < limit_frames)
+               limit_frames = devc->num_frames_segmented;
+       if (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);
+                      PRIu64, devc->num_frames + 1, limit_frames);
 
        switch (devc->model->series->protocol) {
        case PROTOCOL_V1:
@@ -428,6 +431,9 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi)
                        if (rigol_ds_config_set(sdi, ":SING") != SR_OK)
                                return SR_ERR;
                        rigol_ds_set_wait_event(devc, WAIT_STOP);
+                       if (devc->data_source == DATA_SOURCE_SEGMENTED)
+                               if (rigol_ds_config_set(sdi, "FUNC:WREP:FCUR %d", devc->num_frames + 1) != SR_OK)
+                                       return SR_ERR;
                }
                break;
        }
@@ -493,6 +499,11 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
                                        devc->data_source == DATA_SOURCE_LIVE ?
                                                ":WAV:MODE NORM" :":WAV:MODE RAW") != SR_OK)
                        return SR_ERR;
+
+               if (devc->data_source != DATA_SOURCE_LIVE) {
+                       if (rigol_ds_config_set(sdi, ":WAV:RES") != SR_OK)
+                               return SR_ERR;
+               }
                break;
        }
 
@@ -651,9 +662,12 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
                                return TRUE;
                }
 
-               if (devc->model->series->protocol >= PROTOCOL_V3)
+               if (devc->model->series->protocol >= PROTOCOL_V3) {
+                       if (rigol_ds_config_set(sdi, ":WAV:BEG") != SR_OK)
+                               return TRUE;
                        if (sr_scpi_send(sdi->conn, ":WAV:DATA?") != SR_OK)
                                return TRUE;
+               }
 
                if (sr_scpi_read_begin(scpi) != SR_OK)
                        return TRUE;
@@ -756,12 +770,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);
                }
-               /* 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");
-                       std_session_send_df_frame_end(sdi);
-                       sr_dev_acquisition_stop(sdi);
-                       return TRUE;
                }
                devc->num_block_read = 0;
        } else {
@@ -795,7 +805,9 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
                /* Done with this frame. */
                std_session_send_df_frame_end(sdi);
 
-               if (++devc->num_frames == devc->limit_frames) {
+               if (++devc->num_frames == devc->limit_frames || 
+                               devc->num_frames == devc->num_frames_segmented ||
+                               devc->data_source == DATA_SOURCE_MEMORY) {
                        /* Last frame, stop capture. */
                        sr_dev_acquisition_stop(sdi);
                } else {