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

This commit is contained in:
Soeren Apel 2014-08-27 14:22:57 +02:00
parent af3487ec28
commit 0028d5a1ee
2 changed files with 3 additions and 2 deletions

View File

@ -674,8 +674,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
devc->current_channel = devc->enabled_channels; devc->current_channel = devc->enabled_channels;
dlm_channel_data_request(sdi); dlm_channel_data_request(sdi);
/* Call our callback when data comes in or after 50ms. */ /* Call our callback when data comes in or after 5ms. */
sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 10, sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 5,
dlm_data_receive, (void *)sdi); dlm_data_receive, (void *)sdi);
return SR_OK; return SR_OK;

View File

@ -962,6 +962,7 @@ SR_PRIV int dlm_data_receive(int fd, int revents, void *cb_data)
/* Don't care about return value here. */ /* Don't care about return value here. */
dlm_acquisition_stop(sdi->conn); dlm_acquisition_stop(sdi->conn);
g_array_free(data, TRUE); g_array_free(data, TRUE);
dlm_channel_data_request(sdi);
return TRUE; return TRUE;
} }