rigol-ds: Enable/disable LA pod when (de)selecting digital channels.

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

diff --git a/hardware/rigol-ds/protocol.c b/hardware/rigol-ds/protocol.c
index fc938e9d93763ff95dfc9ff00c4198a145201fed..55d437b468806c509487f73b7d620417f5fa8ab6 100644 (file)
--- a/hardware/rigol-ds/protocol.c
+++ b/hardware/rigol-ds/protocol.c
@@ -423,7 +423,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 
        scpi = sdi->conn;
 
-       if (revents == G_IO_IN) {
+       if (revents == G_IO_IN || revents == 0) {
                if (devc->model->protocol == PROTOCOL_IEEE488_2) {
                        switch(devc->wait_event) {
                        case WAIT_NONE:
@@ -457,13 +457,17 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 
                probe = devc->channel_entry->data;
                
+               if (devc->num_block_bytes == 0 &&
+                   devc->model->protocol == PROTOCOL_IEEE488_2) {
+                               if (sr_scpi_send(sdi->conn, ":WAV:DATA?") != SR_OK)
+                                       return TRUE;
+               }
+
                if (devc->num_block_bytes == 0) {
                        if (sr_scpi_read_begin(scpi) != SR_OK)
                                return TRUE;
                        if (devc->model->protocol == PROTOCOL_IEEE488_2) {
                                sr_dbg("New block header expected");
-                               if (sr_scpi_send(sdi->conn, ":WAV:DATA?") != SR_OK)
-                                       return TRUE;
                                len = rigol_ds_read_header(scpi);
                                if (len == -1)
                                        return TRUE;
@@ -586,9 +590,6 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
                                devc->channel_entry = devc->enabled_digital_probes;
                                rigol_ds_channel_start(sdi);
                        } else if (++devc->num_frames == devc->limit_frames) {
-                               /* End of last frame. */
-                               packet.type = SR_DF_END;
-                               sr_session_send(sdi, &packet);
                                sdi->driver->dev_acquisition_stop(sdi, cb_data);
                        } else {
                                /* Get the next frame, starting with the first analog channel. */
@@ -696,16 +697,20 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
 
        /* Digital channel state. */
        if (devc->model->has_digital) {
-               sr_dbg("Current digital channel state:");
+               if (get_cfg_string(sdi, ":LA:DISP?", &t_s) != SR_OK)
+                       return SR_ERR;
+               devc->la_enabled = !strcmp(t_s, "ON") ? TRUE : FALSE;
+               sr_dbg("Logic analyzer %s, current digital channel state:",
+                               devc->la_enabled ? "enabled" : "disabled");
                for (i = 0; i < 16; i++) {
-                       cmd = g_strdup_printf(":DIG%d:TURN?", i + 1);
+                       cmd = g_strdup_printf(":DIG%d:TURN?", i);
                        res = get_cfg_string(sdi, cmd, &t_s);
                        g_free(cmd);
                        if (res != SR_OK)
                                return SR_ERR;
                        devc->digital_channels[i] = !strcmp(t_s, "ON") ? TRUE : FALSE;
                        g_free(t_s);
-                       sr_dbg("D%d: %s", i + 1, devc->digital_channels[i] ? "on" : "off");
+                       sr_dbg("D%d: %s", i, devc->digital_channels[i] ? "on" : "off");
                }
        }