Add sr_dev_acquisition_stop(), factor out SR_ERR_DEV_CLOSED check.

[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 d9d8dc7ea1d79f51352d813146b58f9971840b95..833104e890ddac4c74645a474b1a9077a011ffee 100644 (file)
--- a/src/hardware/rigol-ds/protocol.c
+++ b/src/hardware/rigol-ds/protocol.c
@@ -177,7 +177,7 @@ static int rigol_ds_trigger_wait(const struct sr_dev_inst *sdi)
        if (!(devc = sdi->priv))
                return SR_ERR;
 
-       /* 
+       /*
         * If timebase < 50 msecs/DIV just sleep about one sweep time except
         * for really fast sweeps.
         */
@@ -220,11 +220,19 @@ static int rigol_ds_check_stop(const struct sr_dev_inst *sdi)
        if (devc->model->series->protocol != PROTOCOL_V3)
                return SR_OK;
 
-       if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
-                         ch->index + 1) != SR_OK)
-               return SR_ERR;
+       if (ch->type == SR_CHANNEL_LOGIC) {
+               if (rigol_ds_config_set(sdi->conn, ":WAV:SOUR LA") != SR_OK)
+                       return SR_ERR;
+       } else {
+               if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
+                               ch->index + 1) != SR_OK)
+                       return SR_ERR;
+       }
        /* Check that the number of samples will be accepted */
-       if (rigol_ds_config_set(sdi, ":WAV:POIN %d", devc->analog_frame_size) != SR_OK)
+       if (rigol_ds_config_set(sdi, ":WAV:POIN %d",
+                       ch->type == SR_CHANNEL_LOGIC ?
+                               devc->digital_frame_size :
+                               devc->analog_frame_size) != SR_OK)
                return SR_ERR;
        if (sr_scpi_get_int(sdi->conn, "*ESR?", &tmp) != SR_OK)
                return SR_ERR;
@@ -431,9 +439,14 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
                rigol_ds_set_wait_event(devc, WAIT_NONE);
                break;
        case PROTOCOL_V3:
-               if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
-                                 ch->index + 1) != SR_OK)
-                       return SR_ERR;
+               if (ch->type == SR_CHANNEL_LOGIC) {
+                       if (rigol_ds_config_set(sdi->conn, ":WAV:SOUR LA") != SR_OK)
+                               return SR_ERR;
+               } else {
+                       if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
+                                       ch->index + 1) != 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;
@@ -595,10 +608,10 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 
        if (devc->num_block_bytes == 0) {
                if (devc->model->series->protocol >= PROTOCOL_V4) {
-                       if (sr_scpi_send(sdi->conn, ":WAV:START %d",
+                       if (rigol_ds_config_set(sdi, ":WAV:START %d",
                                        devc->num_channel_bytes + 1) != SR_OK)
                                return TRUE;
-                       if (sr_scpi_send(sdi->conn, ":WAV:STOP %d",
+                       if (rigol_ds_config_set(sdi, ":WAV:STOP %d",
                                        MIN(devc->num_channel_bytes + ACQ_BLOCK_SIZE,
                                                devc->analog_frame_size)) != SR_OK)
                                return TRUE;
@@ -621,7 +634,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
                                sr_err("Read error, aborting capture.");
                                packet.type = SR_DF_FRAME_END;
                                sr_session_send(sdi, &packet);
-                               sdi->driver->dev_acquisition_stop(sdi);
+                               sr_dev_acquisition_stop(sdi);
                                return TRUE;
                        }
                        /* At slow timebases in live capture the DS2072
@@ -654,7 +667,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
                sr_err("Read error, aborting capture.");
                packet.type = SR_DF_FRAME_END;
                sr_session_send(sdi, &packet);
-               sdi->driver->dev_acquisition_stop(sdi);
+               sr_dev_acquisition_stop(sdi);
                return TRUE;
        }
 
@@ -672,7 +685,9 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
                else
                        for (i = 0; i < len; i++)
                                devc->data[i] = (128 - devc->buffer[i]) * vdiv - offset;
-               sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+               float vdivlog = log10f(vdiv);
+               int digits = -(int)vdivlog + (vdivlog < 0.0);
+               sr_analog_init(&analog, &encoding, &meaning, &spec, digits);
                analog.meaning->channels = g_slist_append(NULL, ch);
                analog.num_samples = len;
                analog.data = devc->data;
@@ -712,7 +727,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
                        sr_err("Read should have been completed");
                        packet.type = SR_DF_FRAME_END;
                        sr_session_send(sdi, &packet);
-                       sdi->driver->dev_acquisition_stop(sdi);
+                       sr_dev_acquisition_stop(sdi);
                        return TRUE;
                }
                devc->num_block_read = 0;
@@ -750,7 +765,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 
                if (++devc->num_frames == devc->limit_frames) {
                        /* Last frame, stop capture. */
-                       sdi->driver->dev_acquisition_stop(sdi);
+                       sr_dev_acquisition_stop(sdi);
                } else {
                        /* Get the next frame, starting with the first channel. */
                        devc->channel_entry = devc->enabled_channels;
@@ -769,6 +784,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
+       struct sr_channel *ch;
        char *cmd;
        unsigned int i;
        int res;
@@ -782,6 +798,8 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
                g_free(cmd);
                if (res != SR_OK)
                        return SR_ERR;
+               ch = g_slist_nth_data(sdi->channels, i);
+               ch->enabled = devc->analog_channels[i];
        }
        sr_dbg("Current analog channel state:");
        for (i = 0; i < devc->model->analog_channels; i++)
@@ -790,7 +808,7 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
        /* Digital channel state. */
        if (devc->model->has_digital) {
                if (sr_scpi_get_bool(sdi->conn,
-                               devc->model->series->protocol >= PROTOCOL_V4 ?
+                               devc->model->series->protocol >= PROTOCOL_V3 ?
                                        ":LA:STAT?" : ":LA:DISP?",
                                &devc->la_enabled) != SR_OK)
                        return SR_ERR;
@@ -798,12 +816,14 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
                                devc->la_enabled ? "enabled" : "disabled");
                for (i = 0; i < ARRAY_SIZE(devc->digital_channels); i++) {
                        cmd = g_strdup_printf(
-                               devc->model->series->protocol >= PROTOCOL_V4 ?
+                               devc->model->series->protocol >= PROTOCOL_V3 ?
                                        ":LA:DIG%d:DISP?" : ":DIG%d:TURN?", i);
                        res = sr_scpi_get_bool(sdi->conn, cmd, &devc->digital_channels[i]);
                        g_free(cmd);
                        if (res != SR_OK)
                                return SR_ERR;
+                       ch = g_slist_nth_data(sdi->channels, i + devc->model->analog_channels);
+                       ch->enabled = devc->digital_channels[i];
                        sr_dbg("D%d: %s", i, devc->digital_channels[i] ? "on" : "off");
                }
        }