yokogawa-dlm: Lower timeout to increase throughput and fix data acq bug

diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c
index 030bf85460fbc0531ed087a5bd598e8d0f1ba4bd..9a9c5fea3642593afbc99d7ee013ace9137c30a1 100644 (file)
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -674,8 +674,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        devc->current_channel = devc->enabled_channels;
        dlm_channel_data_request(sdi);
 
-       /* Call our callback when data comes in or after 50ms. */
-       sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 10,
+       /* Call our callback when data comes in or after 5ms. */
+       sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 5,
                        dlm_data_receive, (void *)sdi);
 
        return SR_OK;

diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c
index 84ea966d188a8d16851f33b2d13fe77c8b822c10..582da49236dad6ed8fe4fc9f8b0bfbcf59a8bf4b 100644 (file)
--- a/src/hardware/yokogawa-dlm/protocol.c
+++ b/src/hardware/yokogawa-dlm/protocol.c
@@ -962,6 +962,7 @@ SR_PRIV int dlm_data_receive(int fd, int revents, void *cb_data)
                /* Don't care about return value here. */
                dlm_acquisition_stop(sdi->conn);
                g_array_free(data, TRUE);
+               dlm_channel_data_request(sdi);
                return TRUE;
        }