rigol-ds: Correct digital waveform block sizes.

[libsigrok.git] / hardware / rigol-ds / api.c

diff --git a/hardware/rigol-ds/api.c b/hardware/rigol-ds/api.c
index ef1ee366718d0b90a56c98fc5bc08405bbcb8e97..44847c715be75612d1bc97453ec02f48fd2ea459 100644 (file)
--- a/hardware/rigol-ds/api.c
+++ b/hardware/rigol-ds/api.c
@@ -41,6 +41,7 @@ static const int32_t hwcaps[] = {
        SR_CONF_HORIZ_TRIGGERPOS,
        SR_CONF_NUM_TIMEBASE,
        SR_CONF_LIMIT_FRAMES,
+       SR_CONF_SAMPLERATE,
 };
 
 static const int32_t analog_hwcaps[] = {
@@ -456,17 +457,63 @@ static int cleanup(void)
        return dev_clear();
 }
 
+static int analog_frame_size(const struct sr_dev_inst *sdi)
+{
+       struct dev_context *devc = sdi->priv;
+       struct sr_probe *probe;
+       int analog_probes = 0;
+       GSList *l;
+
+       if (devc->model->protocol == PROTOCOL_LEGACY) {
+               if (devc->model->series == RIGOL_VS5000)
+                       return VS5000_ANALOG_LIVE_WAVEFORM_SIZE;
+               else
+                       return DS1000_ANALOG_LIVE_WAVEFORM_SIZE;
+       } else {
+               for (l = sdi->probes; l; l = l->next) {
+                       probe = l->data;
+                       if (probe->type == SR_PROBE_ANALOG && probe->enabled)
+                               analog_probes++;
+               }
+               if (devc->data_source == DATA_SOURCE_MEMORY) {
+                       if (analog_probes == 1)
+                               return DS2000_ANALOG_MEM_WAVEFORM_SIZE_1C;
+                       else
+                               return DS2000_ANALOG_MEM_WAVEFORM_SIZE_2C;
+               } else {
+                       if (devc->model->series == AGILENT_DSO1000)
+                               return DSO1000_ANALOG_LIVE_WAVEFORM_SIZE;
+                       else
+                               return DS2000_ANALOG_LIVE_WAVEFORM_SIZE;
+               }
+       }
+}
+
+static int digital_frame_size(const struct sr_dev_inst *sdi)
+{
+       struct dev_context *devc = sdi->priv;
+
+       switch (devc->model->series) {
+       case RIGOL_VS5000:
+               return VS5000_DIGITAL_WAVEFORM_SIZE;
+       case RIGOL_DS1000:
+               return DS1000_DIGITAL_WAVEFORM_SIZE;
+       default:
+               return 0;
+       }
+}
+
 static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
                const struct sr_probe_group *probe_group)
 {
        struct dev_context *devc;
+       uint64_t samplerate;
 
        if (!sdi || !(devc = sdi->priv))
                return SR_ERR_ARG;
 
        /* If a probe group is specified, it must be a valid one. */
-       if (probe_group && !g_slist_find(sdi->probe_groups, probe_group))
-       {
+       if (probe_group && !g_slist_find(sdi->probe_groups, probe_group)) {
                sr_err("Invalid probe group specified.");
                return SR_ERR;
        }
@@ -485,6 +532,15 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
                else
                        *data = g_variant_new_string("Segmented");
                break;
+       case SR_CONF_SAMPLERATE:
+               if (devc->data_source == DATA_SOURCE_LIVE) {
+                       samplerate = analog_frame_size(sdi) /
+                               (devc->timebase * devc->model->num_horizontal_divs);
+                       *data = g_variant_new_uint64(samplerate);
+               } else {
+                       return SR_ERR_NA;
+               }
+               break;
        default:
                return SR_ERR_NA;
        }
@@ -509,8 +565,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
                return SR_ERR_DEV_CLOSED;
 
        /* If a probe group is specified, it must be a valid one. */
-       if (probe_group && !g_slist_find(sdi->probe_groups, probe_group))
-       {
+       if (probe_group && !g_slist_find(sdi->probe_groups, probe_group)) {
                sr_err("Invalid probe group specified.");
                return SR_ERR;
        }
@@ -765,6 +820,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        scpi = sdi->conn;
        devc = sdi->priv;
 
+       devc->num_frames = 0;
+
        for (l = sdi->probes; l; l = l->next) {
                probe = l->data;
                sr_dbg("handling probe %s", probe->name);
@@ -777,16 +834,25 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                                if (set_cfg(sdi, ":CHAN%d:DISP %s", probe->index + 1,
                                                probe->enabled ? "ON" : "OFF") != SR_OK)
                                        return SR_ERR;
+                               devc->analog_channels[probe->index] = probe->enabled;
                        }
                } else if (probe->type == SR_PROBE_LOGIC) {
-                       if (probe->enabled)
+                       if (probe->enabled) {
                                devc->enabled_digital_probes = g_slist_append(
                                                devc->enabled_digital_probes, probe);
+                               /* Turn on LA module if currently off. */
+                               if (!devc->la_enabled) {
+                                       if (set_cfg(sdi, ":LA:DISP ON") != SR_OK)
+                                               return SR_ERR;
+                                       devc->la_enabled = TRUE;
+                               }
+                       }
                        if (probe->enabled != devc->digital_channels[probe->index]) {
                                /* Enabled channel is currently disabled, or vice versa. */
                                if (set_cfg(sdi, ":DIG%d:TURN %s", probe->index,
                                                probe->enabled ? "ON" : "OFF") != SR_OK)
                                        return SR_ERR;
+                               devc->digital_channels[probe->index] = probe->enabled;
                        }
                }
        }
@@ -794,6 +860,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        if (!devc->enabled_analog_probes && !devc->enabled_digital_probes)
                return SR_ERR;
 
+       /* Turn off LA module if on and no digital probes selected. */
+       if (devc->la_enabled && !devc->enabled_digital_probes)
+               if (set_cfg(sdi, ":LA:DISP OFF") != SR_OK)
+                       return SR_ERR;
+
        if (devc->data_source == DATA_SOURCE_LIVE) {
                if (set_cfg(sdi, ":RUN") != SR_OK)
                        return SR_ERR;
@@ -817,21 +888,16 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        else
                devc->channel_entry = devc->enabled_digital_probes;
 
+       devc->analog_frame_size = analog_frame_size(sdi);
+       devc->digital_frame_size = digital_frame_size(sdi);
+
        if (devc->model->protocol == PROTOCOL_LEGACY) {
-               devc->analog_frame_size = (devc->model->series == RIGOL_VS5000 ?
-                               VS5000_ANALOG_LIVE_WAVEFORM_SIZE :
-                               DS1000_ANALOG_LIVE_WAVEFORM_SIZE);
                /* Fetch the first frame. */
                if (rigol_ds_channel_start(sdi) != SR_OK)
                        return SR_ERR;
        } else {
                if (devc->enabled_analog_probes) {
-                       if (devc->data_source == DATA_SOURCE_MEMORY)
-                       {
-                               if (g_slist_length(devc->enabled_analog_probes) == 1)
-                                       devc->analog_frame_size = DS2000_ANALOG_MEM_WAVEFORM_SIZE_1C;
-                               else
-                                       devc->analog_frame_size = DS2000_ANALOG_MEM_WAVEFORM_SIZE_2C;
+                       if (devc->data_source == DATA_SOURCE_MEMORY) {
                                /* Apparently for the DS2000 the memory
                                 * depth can only be set in Running state -
                                 * this matches the behaviour of the UI. */
@@ -841,11 +907,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                                        return SR_ERR;
                                if (set_cfg(sdi, ":STOP") != SR_OK)
                                        return SR_ERR;
-                       } else {
-                               if (devc->model->series == AGILENT_DSO1000)
-                                       devc->analog_frame_size = DSO1000_ANALOG_LIVE_WAVEFORM_SIZE;
-                               else
-                                       devc->analog_frame_size = DS2000_ANALOG_LIVE_WAVEFORM_SIZE;
                        }
                        if (rigol_ds_capture_start(sdi) != SR_OK)
                                return SR_ERR;
@@ -859,6 +920,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
        struct dev_context *devc;
        struct sr_scpi_dev_inst *scpi;
+       struct sr_datafeed_packet packet;
 
        (void)cb_data;
 
@@ -869,6 +931,10 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
                return SR_ERR;
        }
 
+       /* End of last frame. */
+       packet.type = SR_DF_END;
+       sr_session_send(sdi, &packet);
+
        g_slist_free(devc->enabled_analog_probes);
        g_slist_free(devc->enabled_digital_probes);
        devc->enabled_analog_probes = NULL;