#include <config.h>
#include <errno.h>
#include <glib.h>
-#include <glib-2.0/glib/gmacros.h>
-#include <glib-2.0/glib/gmain.h>
#include <math.h>
#include <stdlib.h>
#include <stdarg.h>
}
memcpy(&framecount, buf + 40, 4);
if (devc->limit_frames > framecount)
- sr_err("Frame limit higher that frames in buffer of device!");
+ sr_err("Frame limit higher than frames in buffer of device!");
else if (devc->limit_frames == 0)
devc->limit_frames = framecount;
sr_dbg("Starting data capture for history frameset %" PRIu64 " of %" PRIu64,
}
/* Read the header of a data block. */
-static int siglent_sds_read_header(struct sr_dev_inst *sdi, int channelIndex)
+static int siglent_sds_read_header(struct sr_dev_inst *sdi)
{
struct sr_scpi_dev_inst *scpi = sdi->conn;
struct dev_context *devc = sdi->priv;
char *buf = (char *)devc->buffer;
- int ret;
- int descLength;
- int blockOffset = 15; /* Offset for descriptor block. */
- long dataLength = 0;
+ int ret, desc_length;
+ int block_offset = 15; /* Offset for descriptor block. */
+ long data_length = 0;
/* Read header from device. */
- ret = sr_scpi_read_data(scpi, buf + devc->num_header_bytes,
- devc->model->series->buffer_samples);
- if (ret < 346) {
+ ret = sr_scpi_read_data(scpi, buf, SIGLENT_HEADER_SIZE);
+ if (ret < SIGLENT_HEADER_SIZE) {
sr_err("Read error while reading data header.");
return SR_ERR;
}
sr_dbg("Device returned %i bytes.", ret);
devc->num_header_bytes += ret;
- buf += blockOffset; /* Skip to start descriptor block. */
+ buf += block_offset; /* Skip to start descriptor block. */
/* Parse WaveDescriptor header. */
- memcpy(&descLength, buf + 36, 4); /* Descriptor block length */
- memcpy(&dataLength, buf + 60, 4); /* Data block length */
+ memcpy(&desc_length, buf + 36, 4); /* Descriptor block length */
+ memcpy(&data_length, buf + 60, 4); /* Data block length */
- devc->vdiv[channelIndex] = 2;
- devc->vert_offset[channelIndex] = 0;
- devc->blockHeaderSize = descLength + 15;
- ret = dataLength;
+ devc->block_header_size = desc_length + 15;
+ devc->num_samples = data_length;
- sr_dbg("Received data block header: '%s' -> block length %d", buf, ret);
+ sr_dbg("Received data block header: '%s' -> block length %d.", buf, ret);
return ret;
}
struct sr_datafeed_logic logic;
int len, i;
struct sr_channel *ch;
- gsize expected_data_bytes = 0;
- char *memsize;
(void)fd;
if (!(revents == G_IO_IN || revents == 0))
return TRUE;
- memsize = NULL;
- if (sr_scpi_get_string(sdi->conn, "MSIZ?", &memsize) != SR_OK)
- return SR_ERR;
-
switch (devc->wait_event) {
case WAIT_NONE:
break;
sr_err("BUG: Unknown event target encountered.");
break;
}
-
ch = devc->channel_entry->data;
+ len = 0;
if (devc->num_block_bytes == 0) {
- if (g_ascii_strcasecmp(memsize, "14M") == 0) {
+ if (devc->samplerate >= 14000000) {
sr_err("Device memory depth is set to 14Mpts, so please be patient.");
g_usleep(4900000); /* Sleep for large memory set. */
}
+ if (sr_scpi_read_begin(scpi) != SR_OK)
+ return TRUE;
sr_dbg("New block header expected.");
- len = siglent_sds_read_header(sdi, ch->index);
- expected_data_bytes = len;
+ len = siglent_sds_read_header(sdi);
if (len == 0)
/* Still reading the header. */
return TRUE;
sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}
-
- if (devc->data_source == DATA_SOURCE_SCREEN
- && (unsigned)len < expected_data_bytes) {
- sr_dbg("Discarding short data block.");
- sr_scpi_read_data(scpi, (char *)devc->buffer, len + 1);
- return TRUE;
- }
- devc->num_block_bytes = len;
+ devc->num_block_bytes = 0;
devc->num_block_read = 0;
}
- len = devc->num_block_bytes - devc->num_block_read;
- if (len > ACQ_BUFFER_SIZE)
- len = ACQ_BUFFER_SIZE;
-
- /* Offset the data block buffer past the IEEE header and description header. */
- devc->buffer += devc->blockHeaderSize;
-
if (len == -1) {
sr_err("Read error, aborting capture.");
packet.type = SR_DF_FRAME_END;
return TRUE;
}
- sr_dbg("Received %d bytes.", len);
-
- devc->num_block_read += len;
-
- if (ch->type == SR_CHANNEL_ANALOG) {
- float vdiv = devc->vdiv[ch->index];
- float offset = devc->vert_offset[ch->index];
- GArray *float_data;
- static GArray *data;
- float voltage;
- float vdivlog;
- int digits;
-
- data = g_array_sized_new(FALSE, FALSE, sizeof(uint8_t), len);
- g_array_append_vals(data, devc->buffer, len);
- float_data = g_array_new(FALSE, FALSE, sizeof(float));
- for (i = 0; i < len; i++) {
- voltage = (float)g_array_index(data, int8_t, i) / 25;
- voltage = ((vdiv * voltage) - offset);
- g_array_append_val(float_data, voltage);
- }
- vdivlog = log10f(vdiv);
- 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 = float_data->len;
- analog.data = (float *)float_data->data;
- analog.meaning->mq = SR_MQ_VOLTAGE;
- analog.meaning->unit = SR_UNIT_VOLT;
- analog.meaning->mqflags = 0;
- packet.type = SR_DF_ANALOG;
- packet.payload = &analog;
- sr_session_send(sdi, &packet);
- g_slist_free(analog.meaning->channels);
- g_array_free(data, TRUE);
- } else {
- logic.length = len;
- logic.unitsize = 1;
- logic.data = devc->buffer;
- packet.type = SR_DF_LOGIC;
- packet.payload = &logic;
- sr_session_send(sdi, &packet);
- }
-
- if (devc->num_block_read == devc->num_block_bytes) {
- sr_dbg("Block has been completed.");
- sr_dbg("Preparing for possible next block.");
- devc->num_header_bytes = 0;
- devc->num_block_bytes = 0;
- if (devc->data_source != DATA_SOURCE_SCREEN)
- siglent_sds_set_wait_event(devc, WAIT_BLOCK);
- if (!sr_scpi_read_complete(scpi)) {
- sr_err("Read should have been completed.");
+ while (devc->num_block_bytes < devc->num_samples) {
+ len = sr_scpi_read_data(scpi, (char *)devc->buffer, devc->num_samples);
+ if (len == -1) {
+ sr_err("Read error, aborting capture.");
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}
- devc->num_block_read = 0;
- } else {
- sr_dbg("%" PRIu64 " of %" PRIu64 " block bytes read.",
- devc->num_block_read, devc->num_block_bytes);
- }
- devc->num_channel_bytes += len;
- if (devc->num_channel_bytes < expected_data_bytes) {
- /* Don't have the full data for this channel yet, re-run. */
- return TRUE;
+ devc->num_block_read += 1;
+ devc->num_block_bytes += len;
+ if (devc->num_block_bytes >= devc->num_samples ) {
+ /* Offset the data block buffer past the IEEE header and description header. */
+ devc->buffer += devc->block_header_size;
+ len = devc->num_samples;
+ }
+ sr_dbg("Received block: %i, %d bytes.", devc->num_block_read, len);
+ if (ch->type == SR_CHANNEL_ANALOG) {
+ float vdiv = devc->vdiv[ch->index];
+ float offset = devc->vert_offset[ch->index];
+ GArray *float_data;
+ static GArray *data;
+ float voltage, vdivlog;
+ int digits;
+
+ data = g_array_sized_new(FALSE, FALSE, sizeof(uint8_t), len);
+ g_array_append_vals(data, devc->buffer, len);
+ float_data = g_array_new(FALSE, FALSE, sizeof(float));
+ for (i = 0; i < len; i++) {
+ voltage = (float)g_array_index(data, int8_t, i) / 25;
+ voltage = ((vdiv * voltage) - offset);
+ g_array_append_val(float_data, voltage);
+ }
+ vdivlog = log10f(vdiv);
+ 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 = float_data->len;
+ analog.data = (float *)float_data->data;
+ analog.meaning->mq = SR_MQ_VOLTAGE;
+ analog.meaning->unit = SR_UNIT_VOLT;
+ analog.meaning->mqflags = 0;
+ packet.type = SR_DF_ANALOG;
+ packet.payload = &analog;
+ sr_session_send(sdi, &packet);
+ g_slist_free(analog.meaning->channels);
+ g_array_free(data, TRUE);
+ } else {
+ logic.length = len;
+ logic.unitsize = 1;
+ logic.data = devc->buffer;
+ packet.type = SR_DF_LOGIC;
+ packet.payload = &logic;
+ sr_session_send(sdi, &packet);
+ }
+
+ if (devc->num_samples == devc->num_block_bytes) {
+ sr_dbg("Transfer has been completed.");
+ devc->num_header_bytes = 0;
+ devc->num_block_bytes = 0;
+ if (!sr_scpi_read_complete(scpi)) {
+ sr_err("Read should have been completed.");
+ packet.type = SR_DF_FRAME_END;
+ sr_session_send(sdi, &packet);
+ sdi->driver->dev_acquisition_stop(sdi);
+ return TRUE;
+ }
+ devc->num_block_read = 0;
+ } else {
+ sr_dbg("%" PRIu64 " of %" PRIu64 " block bytes read.",
+ devc->num_block_bytes, devc->num_samples);
+ }
}
+
if (devc->channel_entry->next) {
/* We got the frame for this channel, now get the next channel. */
devc->channel_entry = devc->channel_entry->next;
{
struct dev_context *devc;
struct sr_channel *ch;
- char *cmd;
+ char *cmd, *response;
unsigned int i;
- int res;
- char *response;
+ int res, num_tokens;
gchar **tokens;
- int num_tokens;
+ int len;
+ float trigger_pos;
devc = sdi->priv;
sr_dbg("Current trigger source: %s.", devc->trigger_source);
/* TODO: Horizontal trigger position. */
-
- devc->horiz_triggerpos = 0;
- sr_dbg("Current horizontal trigger position: %g.", devc->horiz_triggerpos);
+ response = "";
+ trigger_pos = 0;
+ if (sr_scpi_get_string(sdi->conn, g_strdup_printf("%s:TRDL?", devc->trigger_source), &response) != SR_OK)
+ return SR_ERR;
+ len = strlen(response);
+ if (!g_ascii_strcasecmp(response + (len - 2), "us")) {
+ trigger_pos = atof(response) / SR_GHZ(1);
+ sr_dbg("Current trigger position us %s.", response);
+ } else if (!g_ascii_strcasecmp(response + (len - 2), "ns")) {
+ trigger_pos = atof(response) / SR_MHZ(1);
+ sr_dbg("Current trigger position ms %s.", response);
+ } else if (!g_ascii_strcasecmp(response + (len - 2), "ms")) {
+ trigger_pos = atof(response) / SR_KHZ(1);
+ sr_dbg("Current trigger position ns %s.", response);
+ } else if (!g_ascii_strcasecmp(response + (len - 2), "s")) {
+ trigger_pos = atof(response);
+ sr_dbg("Current trigger position s %s.", response);
+ };
+ devc->horiz_triggerpos = trigger_pos;
+
+ sr_dbg("Current horizontal trigger position %.10f", devc->horiz_triggerpos);
/* Trigger slope. */
cmd = g_strdup_printf("%s:TRSL?", devc->trigger_source);
struct dev_context *devc;
char *cmd;
int res;
- char *samplePointsString;
- float samplerateScope;
- float fvalue;
+ char *sample_points_string;
+ float samplerate_scope, fvalue;
char *first, *concat;
devc = sdi->priv;
cmd = g_strdup_printf("SANU? C1");
- res = sr_scpi_get_string(sdi->conn, cmd, &samplePointsString);
+ res = sr_scpi_get_string(sdi->conn, cmd, &sample_points_string);
g_free(cmd);
if (res != SR_OK)
return SR_ERR;
- if (g_strstr_len(samplePointsString, -1, "Mpts") != NULL) {
- samplePointsString[strlen(samplePointsString) - 4] = '\0';
+ if (g_strstr_len(sample_points_string, -1, "Mpts") != NULL) {
+ sample_points_string[strlen(sample_points_string) - 4] = '\0';
- if (g_strstr_len(samplePointsString, -1, ".") != NULL) {
- first = strtok(samplePointsString, ".");
+ if (g_strstr_len(sample_points_string, -1, ".") != NULL) {
+ first = strtok(sample_points_string, ".");
concat = strcat(first, strtok(NULL, "."));
if (sr_atof_ascii(concat, &fvalue) != SR_OK || fvalue == 0.0) {
sr_dbg("Invalid float converted from scope response.");
return SR_ERR;
}
} else {
- if (sr_atof_ascii(samplePointsString, &fvalue) != SR_OK || fvalue == 0.0) {
+ if (sr_atof_ascii(sample_points_string, &fvalue) != SR_OK || fvalue == 0.0) {
sr_dbg("Invalid float converted from scope response.");
return SR_ERR;
}
}
- samplerateScope = fvalue * 100000;
+ samplerate_scope = fvalue * 100000;
} else {
- samplePointsString[strlen(samplePointsString) - 4] = '\0';
- if (sr_atof_ascii(samplePointsString, &fvalue) != SR_OK || fvalue == 0.0) {
+ sample_points_string[strlen(sample_points_string) - 4] = '\0';
+ if (sr_atof_ascii(sample_points_string, &fvalue) != SR_OK || fvalue == 0.0) {
sr_dbg("Invalid float converted from scope response.");
return SR_ERR;
}
- samplerateScope = fvalue * 1000;
+ samplerate_scope = fvalue * 1000;
}
/* Get the timebase. */
if (sr_scpi_get_float(sdi->conn, ":TDIV?", &devc->timebase) != SR_OK)
return SR_ERR;
sr_dbg("Current timebase: %g.", devc->timebase);
- devc->sampleRate = samplerateScope / (devc->timebase * devc->model->series->num_horizontal_divs);
+ devc->samplerate = samplerate_scope / (devc->timebase * devc->model->series->num_horizontal_divs);
return SR_OK;
}
projects / libsigrok.git / blobdiff