static const uint64_t timebases[][2] = {
/* picoseconds */
- { 20, 1000000000000 },
- { 50, 1000000000000 },
- { 100, 1000000000000 },
- { 200, 1000000000000 },
- { 500, 1000000000000 },
+ { 20, UINT64_C(1000000000000) },
+ { 50, UINT64_C(1000000000000) },
+ { 100, UINT64_C(1000000000000) },
+ { 200, UINT64_C(1000000000000) },
+ { 500, UINT64_C(1000000000000) },
/* nanoseconds */
{ 1, 1000000000 },
{ 2, 1000000000 },
return result;
}
-SR_PRIV int lecroy_xstream_update_sample_rate(const struct sr_dev_inst *sdi)
+SR_PRIV int lecroy_xstream_update_sample_rate(const struct sr_dev_inst *sdi,
+ int num_of_samples)
{
struct dev_context *devc;
struct scope_state *state;
const struct scope_config *config;
- float memsize, timediv;
+ double time_div;
devc = sdi->priv;
- state = devc->model_state;
config = devc->model_config;
+ state = devc->model_state;
- if (sr_scpi_get_float(sdi->conn, "MEMORY_SIZE?", &memsize) != SR_OK)
- return SR_ERR;
-
- if (sr_scpi_get_float(sdi->conn, "TIME_DIV?", &timediv) != SR_OK)
+ if (sr_scpi_get_double(sdi->conn, "TIME_DIV?", &time_div) != SR_OK)
return SR_ERR;
- state->sample_rate = 1 / ((timediv * config->num_xdivs) / memsize);
+ state->sample_rate = num_of_samples / (time_div * config->num_xdivs);
return SR_OK;
}
if (sr_scpi_get_float(sdi->conn, "TRIG_DELAY?", &state->horiz_triggerpos) != SR_OK)
return SR_ERR;
- if (lecroy_xstream_update_sample_rate(sdi) != SR_OK)
- return SR_ERR;
-
sr_info("Fetching finished.");
scope_state_dump(config, state);
struct sr_channel *ch;
struct sr_dev_inst *sdi;
struct dev_context *devc;
+ struct scope_state *state;
struct sr_datafeed_packet packet;
GByteArray *data;
struct sr_datafeed_analog analog;
return TRUE;
ch = devc->current_channel->data;
+ state = devc->model_state;
if (ch->type != SR_CHANNEL_ANALOG)
return SR_ERR;
return SR_ERR;
if (analog.num_samples == 0) {
+ g_free(analog.data);
+
/* No data available, we have to acquire data first. */
g_snprintf(command, sizeof(command), "ARM;WAIT;*OPC;C%d:WAVEFORM?", ch->index + 1);
sr_scpi_send(sdi->conn, command);
+
+ state->sample_rate = 0;
return TRUE;
+ } else {
+ /* Update sample rate if needed. */
+ if (state->sample_rate == 0)
+ if (lecroy_xstream_update_sample_rate(sdi, analog.num_samples) != SR_OK)
+ return SR_ERR;
}
/*
* number of frames, or continue reception by starting over at
* the first enabled channel.
*/
- if (++devc->num_frames == devc->frame_limit) {
+ devc->num_frames++;
+ if (devc->frame_limit && (devc->num_frames == devc->frame_limit)) {
sr_dev_acquisition_stop(sdi);
} else {
devc->current_channel = devc->enabled_channels;
+
+ /* Wait for trigger, then begin fetching data. */
+ g_snprintf(command, sizeof(command), "ARM;WAIT;*OPC");
+ sr_scpi_send(sdi->conn, command);
+
lecroy_xstream_request_data(sdi);
}