X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsiglent-sds%2Fprotocol.c;h=64d26ce378e1be47a85535b99623e239071a329a;hb=4fc4b8e7aa63d80bc2d2a032d0126d212d5d46ec;hp=af20fde00c952894c157a17a0c2a062c665829f3;hpb=3e7fb88f21d9b6d87652af2d988c83d8481592de;p=libsigrok.git diff --git a/src/hardware/siglent-sds/protocol.c b/src/hardware/siglent-sds/protocol.c index af20fde0..64d26ce3 100644 --- a/src/hardware/siglent-sds/protocol.c +++ b/src/hardware/siglent-sds/protocol.c @@ -25,8 +25,6 @@ #include #include #include -#include -#include #include #include #include @@ -193,7 +191,7 @@ SR_PRIV int siglent_sds_capture_start(const struct sr_dev_inst *sdi) } 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, @@ -252,14 +250,13 @@ SR_PRIV int siglent_sds_channel_start(const struct sr_dev_inst *sdi) } /* 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. */ + int ret, desc_length; + int block_offset = 15; /* Offset for descriptor block. */ long dataLength = 0; /* Read header from device. */ @@ -271,18 +268,16 @@ static int siglent_sds_read_header(struct sr_dev_inst *sdi, int channelIndex) } 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(&desc_length, buf + 36, 4); /* Descriptor block length */ memcpy(&dataLength, buf + 60, 4); /* Data block length */ - devc->vdiv[channelIndex] = 2; - devc->vert_offset[channelIndex] = 0; - devc->blockHeaderSize = descLength + 15; + devc->block_header_size = desc_length + 15; ret = dataLength; - 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; } @@ -353,7 +348,7 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data) g_usleep(4900000); /* Sleep for large memory set. */ } sr_dbg("New block header expected."); - len = siglent_sds_read_header(sdi, ch->index); + len = siglent_sds_read_header(sdi); expected_data_bytes = len; if (len == 0) /* Still reading the header. */ @@ -381,7 +376,7 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data) len = ACQ_BUFFER_SIZE; /* Offset the data block buffer past the IEEE header and description header. */ - devc->buffer += devc->blockHeaderSize; + devc->buffer += devc->block_header_size; if (len == -1) { sr_err("Read error, aborting capture."); @@ -400,8 +395,7 @@ SR_PRIV int siglent_sds_receive(int fd, int revents, void *cb_data) float offset = devc->vert_offset[ch->index]; GArray *float_data; static GArray *data; - float voltage; - float vdivlog; + float voltage, vdivlog; int digits; data = g_array_sized_new(FALSE, FALSE, sizeof(uint8_t), len); @@ -489,12 +483,12 @@ SR_PRIV int siglent_sds_get_dev_cfg(const struct sr_dev_inst *sdi) { 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; @@ -598,9 +592,27 @@ SR_PRIV int siglent_sds_get_dev_cfg(const struct sr_dev_inst *sdi) 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); @@ -661,47 +673,46 @@ SR_PRIV int siglent_sds_get_dev_cfg_horizontal(const struct sr_dev_inst *sdi) 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; }