*/
#include <config.h>
-
#include <fcntl.h>
#include <glib.h>
#include <math.h>
#include <string.h>
#include <strings.h>
#include <unistd.h>
-
#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
#include "protocol.h"
static const uint32_t scanopts[] = {
SR_CONF_CONN,
- SR_CONF_SERIALCOMM
+ SR_CONF_SERIALCOMM,
};
static const uint32_t devopts[] = {
#define NUM_VDIV ARRAY_SIZE(vdivs)
static const char *trigger_sources[] = {
- "CH1",
- "CH2",
- "Ext",
- "Ext /5",
- "AC Line",
- "D0",
- "D1",
- "D2",
- "D3",
- "D4",
- "D5",
- "D6",
- "D7",
- "D8",
- "D9",
- "D10",
- "D11",
- "D12",
- "D13",
- "D14",
- "D15",
+ "CH1", "CH2", "Ext", "Ext /5", "AC Line",
+ "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
+ "D8", "D9", "D10", "D11", "D12", "D13", "D14", "D15",
};
static const char *trigger_slopes[] = {
- "Rising",
- "Falling",
+ "Rising", "Falling",
};
static const char *coupling[] = {
};
static const uint64_t probe_factor[] = {
- 1,
- 2,
- 5,
- 10,
- 20,
- 50,
- 100,
- 200,
- 500,
- 1000,
- 2000,
- 5000,
- 10000,
+ 1, 2, 5, 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000,
};
-/* Do not change the order of entries */
+/* Do not change the order of entries. */
static const char *data_sources[] = {
"Display",
"History",
SDS2000X,
};
-/* short name, full name, USB Name */
+/* short name, full name, USB name */
static const struct siglent_sds_vendor supported_vendors[] = {
[SIGLENT] = {
"Siglent", "Siglent Technologies", "Siglent Technologies Co,. Ltd.",
/* vendor, series, protocol, max timebase, min vdiv, number of horizontal divs,
* number of vertical divs, live waveform samples, memory buffer samples */
static const struct siglent_sds_series supported_series[] = {
- [SDS1000CML] = {
- VENDOR(SIGLENT), "SDS1000CML", NON_SPO_MODEL,
- { 50, 1 },
- { 2, 1000 }, 18, 8, 1400363,
- },
- [SDS1000CNL] = {
- VENDOR(SIGLENT), "SDS1000CNL", NON_SPO_MODEL,
- { 50, 1 },
- { 2, 1000 }, 18, 8, 1400363,
- },
- [SDS1000DL] = {
- VENDOR(SIGLENT), "SDS1000DL", NON_SPO_MODEL,
- { 50, 1 },
- { 2, 1000 }, 18, 8, 1400363,
- },
- [SDS1000X] = {
- VENDOR(SIGLENT), "SDS1000X", SPO_MODEL,
- { 50, 1 },
- { 500, 100000 }, 14, 8, 14000363,
- },
- [SDS1000XP] = {
- VENDOR(SIGLENT), "SDS1000X+", SPO_MODEL,
- { 50, 1 },
- { 500, 100000 }, 14, 8, 14000363,
- },
- [SDS1000XE] = {
- VENDOR(SIGLENT), "SDS1000XE", SPO_MODEL,
- { 50, 1 },
- { 500, 100000 }, 14, 8, 14000363,
- },
- [SDS2000X] = {
- VENDOR(SIGLENT), "SDS2000X", SPO_MODEL,
- { 50, 1 },
- { 500, 100000 }, 14, 8, 14000363,
- },
+ [SDS1000CML] = {VENDOR(SIGLENT), "SDS1000CML", NON_SPO_MODEL,
+ { 50, 1 }, { 2, 1000 }, 18, 8, 1400363},
+ [SDS1000CNL] = {VENDOR(SIGLENT), "SDS1000CNL", NON_SPO_MODEL,
+ { 50, 1 }, { 2, 1000 }, 18, 8, 1400363},
+ [SDS1000DL] = {VENDOR(SIGLENT), "SDS1000DL", NON_SPO_MODEL,
+ { 50, 1 }, { 2, 1000 }, 18, 8, 1400363},
+ [SDS1000X] = {VENDOR(SIGLENT), "SDS1000X", SPO_MODEL,
+ { 50, 1 }, { 500, 100000 }, 14, 8, 14000363},
+ [SDS1000XP] = {VENDOR(SIGLENT), "SDS1000X+", SPO_MODEL,
+ { 50, 1 }, { 500, 100000 }, 14, 8, 14000363},
+ [SDS1000XE] = {VENDOR(SIGLENT), "SDS1000XE", SPO_MODEL,
+ { 50, 1 }, { 500, 100000 }, 14, 8, 14000363},
+ [SDS2000X] = {VENDOR(SIGLENT), "SDS2000X", SPO_MODEL,
+ { 50, 1 }, { 500, 100000 }, 14, 8, 14000363},
};
#define SERIES(x) &supported_series[x]
/* series, model, min timebase, analog channels, digital */
static const struct siglent_sds_model supported_models[] = {
- { SERIES(SDS1000CML), "SDS1152CML",
- { 20, 1000000000 }, 2, false, 0 },
- { SERIES(SDS1000CML), "SDS1102CML",
- { 10, 1000000000 }, 2, false, 0 },
- { SERIES(SDS1000CML), "SDS1072CML",
- { 5, 1000000000 }, 2, false, 0 },
- { SERIES(SDS1000CNL), "SDS1202CNL",
- { 20, 1000000000 }, 2, false, 0 },
- { SERIES(SDS1000CNL), "SDS1102CNL",
- { 10, 1000000000 }, 2, false, 0 },
- { SERIES(SDS1000CNL), "SDS1072CNL",
- { 5, 1000000000 }, 2, false, 0 },
- { SERIES(SDS1000DL), "SDS1202DL",
- { 20, 1000000000 }, 2, false, 0 },
- { SERIES(SDS1000DL), "SDS1102DL",
- { 10, 1000000000 }, 2, false, 0 },
- { SERIES(SDS1000DL), "SDS1022DL",
- { 5, 1000000000 }, 2, false, 0 },
- { SERIES(SDS1000DL), "SDS1052DL",
- { 5, 1000000000 }, 2, false, 0 },
- { SERIES(SDS1000X), "SDS1102X",
- { 2, 1000000000 }, 2, false, 0 },
- { SERIES(SDS1000XP), "SDS1102X+",
- { 2, 1000000000 }, 2, false, 0 },
- { SERIES(SDS1000X), "SDS1202X",
- { 2, 1000000000 }, 2, false, 0 },
- { SERIES(SDS1000XP), "SDS1202X+",
- { 2, 1000000000 }, 2, false, 0 },
- { SERIES(SDS1000XE), "SDS1202X-E",
- { 1, 1000000000 }, 2, false, 0 },
- { SERIES(SDS1000XE), "SDS1104X-E",
- { 1, 1000000000 }, 4, true, 16 },
- { SERIES(SDS1000XE), "SDS1204X-E",
- { 1, 1000000000 }, 4, true, 16 },
- { SERIES(SDS2000X), "SDS2072X",
- { 2, 1000000000 }, 2, false, 0 },
- { SERIES(SDS2000X), "SDS2074X",
- { 2, 1000000000 }, 4, false, 0 },
- { SERIES(SDS2000X), "SDS2102X",
- { 2, 1000000000 }, 2, false, 0 },
- { SERIES(SDS2000X), "SDS2104X",
- { 2, 1000000000 }, 4, false, 0 },
- { SERIES(SDS2000X), "SDS2202X",
- { 2, 1000000000 }, 2, false, 0 },
- { SERIES(SDS2000X), "SDS2204X",
- { 2, 1000000000 }, 4, false, 0 },
- { SERIES(SDS2000X), "SDS2302X",
- { 2, 1000000000 }, 2, false, 0 },
- { SERIES(SDS2000X), "SDS2304X",
- { 2, 1000000000 }, 4, false, 0 },
+ { SERIES(SDS1000CML), "SDS1152CML", { 20, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS1000CML), "SDS1102CML", { 10, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS1000CML), "SDS1072CML", { 5, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS1000CNL), "SDS1202CNL", { 20, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS1000CNL), "SDS1102CNL", { 10, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS1000CNL), "SDS1072CNL", { 5, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS1000DL), "SDS1202DL", { 20, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS1000DL), "SDS1102DL", { 10, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS1000DL), "SDS1022DL", { 5, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS1000DL), "SDS1052DL", { 5, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS1000X), "SDS1102X", { 2, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS1000XP), "SDS1102X+", { 2, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS1000X), "SDS1202X", { 2, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS1000XP), "SDS1202X+", { 2, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS1000XE), "SDS1202X-E", { 1, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS1000XE), "SDS1104X-E", { 1, 1000000000 }, 4, true, 16 },
+ { SERIES(SDS1000XE), "SDS1204X-E", { 1, 1000000000 }, 4, true, 16 },
+ { SERIES(SDS2000X), "SDS2072X", { 2, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS2000X), "SDS2074X", { 2, 1000000000 }, 4, false, 0 },
+ { SERIES(SDS2000X), "SDS2102X", { 2, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS2000X), "SDS2104X", { 2, 1000000000 }, 4, false, 0 },
+ { SERIES(SDS2000X), "SDS2202X", { 2, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS2000X), "SDS2204X", { 2, 1000000000 }, 4, false, 0 },
+ { SERIES(SDS2000X), "SDS2302X", { 2, 1000000000 }, 2, false, 0 },
+ { SERIES(SDS2000X), "SDS2304X", { 2, 1000000000 }, 4, false, 0 },
};
SR_PRIV struct sr_dev_driver siglent_sds_driver_info;
static int dev_clear(const struct sr_dev_driver *di)
{
-
return std_dev_clear_with_callback(di, clear_helper);
}
const struct siglent_sds_model *model;
gchar *channel_name;
- sr_info("Device probing decode...");
-
- /* Setting communication Header Format to OFF*/
- sr_dbg("Setting Communication Headers to off");
+ sr_dbg("Setting Communication Headers to off.");
if (sr_scpi_send(scpi, "CHDR OFF") != SR_OK)
return NULL;
}
}
- sr_info("Decoded Manufacturer: %s", hw_info->manufacturer);
- sr_info("Decoded Model: %s", hw_info->model);
-
if (!model) {
sr_scpi_hw_info_free(hw_info);
return NULL;
}
sdi = g_malloc0(sizeof(struct sr_dev_inst));
- sr_dbg("Setting Device Instance Vendor: %s", model->series->vendor->name);
sdi->vendor = g_strdup(model->series->vendor->name);
- sr_dbg("Setting Device Instance model: %s", model->name);
sdi->model = g_strdup(model->name);
- sr_dbg("Setting Device Instance version: %s", hw_info->firmware_version);
sdi->version = g_strdup(hw_info->firmware_version);
sdi->conn = scpi;
sdi->driver = &siglent_sds_driver_info;
- sr_dbg("Setting Device Instance inst_type: SCPI");
sdi->inst_type = SR_INST_SCPI;
sdi->serial_num = g_strdup(hw_info->serial_number);
devc = g_malloc0(sizeof(struct dev_context));
devc->limit_frames = 1;
devc->model = model;
- sr_dbg("Setting device Context model: %s", devc->model->name);
sr_scpi_hw_info_free(hw_info);
}
devc->buffer = g_malloc(devc->model->series->buffer_samples);
- sr_dbg("Setting device Context buffer Size: %i", devc->model->series->buffer_samples);
+ sr_dbg("Setting device context buffer size: %i.", devc->model->series->buffer_samples);
devc->data = g_malloc(devc->model->series->buffer_samples * sizeof(float));
devc->data_source = DATA_SOURCE_SCREEN;
static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
-
- // TODO implement RPC call for LXI device discovery.
+ /* TODO: Implement RPC call for LXI device discovery. */
return sr_scpi_scan(di->context, options, probe_device);
}
static int dev_close(struct sr_dev_inst *sdi)
{
-
return sr_scpi_close(sdi->conn);
}
-
static int config_get(uint32_t key, GVariant **data,
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
case SR_CONF_SAMPLERATE:
siglent_sds_get_dev_cfg_horizontal(sdi);
*data = g_variant_new_uint64(devc->sampleRate);
- sr_dbg("Sample rate set to %f", devc->sampleRate);
break;
case SR_CONF_TRIGGER_SOURCE:
if (!strcmp(devc->trigger_source, "ACL"))
case SR_CONF_TRIGGER_SLOPE:
tmp_str = g_variant_get_string(data, NULL);
g_free(devc->trigger_slope);
- ret = siglent_sds_config_set(sdi, "%s:TRSL %s", devc->trigger_source, devc->trigger_slope);
+ ret = siglent_sds_config_set(sdi, "%s:TRSL %s",
+ devc->trigger_source, devc->trigger_slope);
break;
case SR_CONF_HORIZ_TRIGGERPOS:
t_dbl = g_variant_get_double(data);
cmd = g_strdup_printf("%luNS", p);
break;
}
- sr_dbg("Setting device Timebase: TDIV %s", cmd);
+ sr_dbg("Setting device timebase: TDIV %s.", cmd);
ret = siglent_sds_config_set(sdi, "TDIV %s", cmd);
break;
}
}
break;
case SR_CONF_VDIV:
- if (!cg) {
- sr_err("No channel group specified.");
+ if (!cg)
return SR_ERR_CHANNEL_GROUP;
- }
g_variant_get(data, "(tt)", &p, &q);
for (i = 0; i < devc->model->analog_channels; i++) {
char *cmd;
cmd = g_strdup_printf("%luUV", p);
break;
}
- return siglent_sds_config_set(sdi, "C%d:VDIV %s", i + 1,
- cmd);
+ return siglent_sds_config_set(sdi, "C%d:VDIV %s", i + 1, cmd);
}
sr_err("Invalid vdiv index: %d.", j);
return SR_ERR_ARG;
sr_dbg("Didn't set vdiv, unknown channel(group).");
return SR_ERR_NA;
case SR_CONF_COUPLING:
- if (!cg) {
- sr_err("No channel group specified.");
+ if (!cg)
return SR_ERR_CHANNEL_GROUP;
- }
tmp_str = g_variant_get_string(data, NULL);
for (i = 0; i < devc->model->analog_channels; i++) {
char cmd[4];
devc->coupling[i] = g_strdup(coupling[j]);
strncpy(cmd, devc->coupling[i], 3);
cmd[3] = 0;
- return siglent_sds_config_set(sdi, "C%d:CPL %s", i + 1,
- cmd);
+ return siglent_sds_config_set(sdi, "C%d:CPL %s", i + 1, cmd);
}
}
sr_err("Invalid coupling index: %d.", j);
sr_dbg("Didn't set coupling, unknown channel(group).");
return SR_ERR_NA;
case SR_CONF_PROBE_FACTOR:
- if (!cg) {
- sr_err("No channel group specified.");
+ if (!cg)
return SR_ERR_CHANNEL_GROUP;
- }
p = g_variant_get_uint64(data);
for (i = 0; i < devc->model->analog_channels; i++) {
if (cg == devc->analog_groups[i]) {
for (j = 0; j < ARRAY_SIZE(probe_factor); j++) {
if (p == probe_factor[j]) {
devc->attenuation[i] = p;
- ret = siglent_sds_config_set(sdi, "C%d:ATTN %"PRIu64,
- i + 1, p);
+ ret = siglent_sds_config_set(sdi, "C%d:ATTN %" PRIu64, i + 1, p);
if (ret == SR_OK)
siglent_sds_get_dev_cfg_vertical(sdi);
return ret;
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
- if (!cg) {
- sr_err("No channel group specified.");
+ if (!cg)
return SR_ERR_CHANNEL_GROUP;
- }
if (cg == devc->digital_group) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
NULL, 0, sizeof(uint32_t));
}
break;
case SR_CONF_COUPLING:
- if (!cg) {
- sr_err("No channel group specified.");
+ if (!cg)
return SR_ERR_CHANNEL_GROUP;
- }
*data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
break;
case SR_CONF_PROBE_FACTOR:
- if (!cg) {
- sr_err("No channel group specified.");
+ if (!cg)
return SR_ERR_CHANNEL_GROUP;
- }
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
probe_factor, ARRAY_SIZE(probe_factor), sizeof(uint64_t));
break;
if (!devc)
/* Can't know this until we have the exact model. */
return SR_ERR_ARG;
- if (!cg) {
- sr_err("No channel group specified.");
+ if (!cg)
return SR_ERR_CHANNEL_GROUP;
- }
g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
for (i = 0; i < devc->num_vdivs; i++) {
rational[0] = g_variant_new_uint64(devc->vdivs[i][0]);
/* Can't know this until we have the exact model. */
return SR_ERR_ARG;
switch (devc->model->series->protocol) {
- // TODO check what must be done here for the data source buffer sizes
+ /* TODO: Check what must be done here for the data source buffer sizes. */
case NON_SPO_MODEL:
*data = g_variant_new_strv(data_sources, ARRAY_SIZE(data_sources) - 1);
break;
*data = g_variant_new_int32(devc->model->series->num_horizontal_divs);
break;
case SR_CONF_AVERAGING:
- //TODO implement averaging.
+ /* TODO: Implement averaging. */
break;
default:
return SR_ERR_NA;
devc->num_frames = 0;
some_digital = FALSE;
- /* Check if there are any logic channels enabled, if so then enable de MSO, otherwise skip the digital channel setup */
- /* enable and disable channels on the device is very slow and it is faster when checked in a small loop without the actual actions */
+ /*
+ * Check if there are any logic channels enabled, if so then enable
+ * the MSO, otherwise skip the digital channel setup. Enable and
+ * disable channels on the device is very slow and it is faster when
+ * checked in a small loop without the actual actions.
+ */
for (d = sdi->channels; d; d = d->next) {
ch = d->data;
- if (ch->type == SR_CHANNEL_LOGIC && ch->enabled) {
+ if (ch->type == SR_CHANNEL_LOGIC && ch->enabled)
some_digital = TRUE;
- }
}
for (l = sdi->channels; l; l = l->next) {
ch = l->data;
- sr_dbg("handling channel %s", ch->name);
if (ch->type == SR_CHANNEL_ANALOG) {
if (ch->enabled)
devc->enabled_channels = g_slist_append(
if (siglent_sds_config_set(sdi, "D%d:DGCH %s", ch->index,
ch->enabled ? "ON" : "OFF") != SR_OK)
return SR_ERR;
- /* Slowing the command sequence down to let the device handle it */
+ /* Slowing the command sequence down to let the device handle it. */
g_usleep(630000);
devc->digital_channels[ch->index] = ch->enabled;
}
return SR_ERR;
break;
case NON_SPO_MODEL:
- //TODO implement CML/CNL/DL models
+ /* TODO: Implement CML/CNL/DL models. */
if (siglent_sds_config_set(sdi, "WFSU SP,0,TYPE,1") != SR_OK)
return SR_ERR;
if (siglent_sds_config_set(sdi, "ACQW SAMPLING") != SR_OK)
SR_PRIV struct sr_dev_driver siglent_sds_driver_info = {
.name = "siglent-sds",
- .longname = "Siglent SDS1000/SDS2000 Series",
+ .longname = "Siglent SDS1000/SDS2000",
.api_version = 1,
.init = std_init,
.cleanup = std_cleanup,
/*
* This file is part of the libsigrok project.
*
- * Siglent implementation:
* Copyright (C) 2016 mhooijboer <marchelh@gmail.com>
- *
- * The Siglent implementation is based on Rigol driver sources, which are:
* Copyright (C) 2012 Martin Ling <martin-git@earth.li>
* Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
* Copyright (C) 2013 Mathias Grimmberger <mgri@zaphod.sax.de>
#define _GNU_SOURCE
#include <config.h>
-
#include <errno.h>
#include <glib.h>
#include <glib-2.0/glib/gmacros.h>
#include <string.h>
#include <time.h>
#include <unistd.h>
-
#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
#include "scpi.h"
#include "protocol.h"
-/* Set the next event to wait for in siglent_sds_receive */
+/* Set the next event to wait for in siglent_sds_receive(). */
static void siglent_sds_set_wait_event(struct dev_context *devc, enum wait_events event)
{
-
if (event == WAIT_STOP) {
devc->wait_status = 2;
} else {
start = time(NULL);
- s = 10000; /* Sleep time for status refresh */
+ s = 10000; /* Sleep time for status refresh. */
if (devc->wait_status == 1) {
do {
if (time(NULL) - start >= 3) {
- sr_dbg("Timeout waiting for trigger");
+ sr_dbg("Timeout waiting for trigger.");
return SR_ERR_TIMEOUT;
}
sr_atoi(buf, &out);
g_usleep(s);
} while (out == 0);
- sr_dbg("Device triggerd");
- if (devc->timebase < 0.51) {
- if (devc->timebase > 0.99e-6) {
- /*
- * Timebase * num hor. divs * 85(%) * 1e6(usecs) / 100
- * -> 85 percent of sweep time
- */
- s = (devc->timebase * devc->model->series->num_horizontal_divs * 1000);
- sr_spew("Sleeping for %ld usecs after trigger, to let the acq buffer in the device fill", s);
- g_usleep(s);
- }
+ sr_dbg("Device triggered.");
+
+ if ((devc->timebase < 0.51) && (devc->timebase > 0.99e-6)) {
+ /*
+ * Timebase * num hor. divs * 85(%) * 1e6(usecs) / 100
+ * -> 85 percent of sweep time
+ */
+ s = (devc->timebase * devc->model->series->num_horizontal_divs * 1000);
+ sr_spew("Sleeping for %ld usecs after trigger, "
+ "to let the acq buffer in the device fill", s);
+ g_usleep(s);
}
}
if (devc->wait_status == 2) {
do {
if (time(NULL) - start >= 3) {
- sr_dbg("Timeout waiting for trigger");
+ sr_dbg("Timeout waiting for trigger.");
return SR_ERR_TIMEOUT;
}
if (sr_scpi_get_string(sdi->conn, ":INR?", &buf) != SR_OK)
* to get encoded? This needs review, and adjustment.
*/
} while ((out | DEVICE_STATE_TRIG_RDY && out | DEVICE_STATE_DATA_ACQ) && out | DEVICE_STATE_STOPPED);
- sr_dbg("Device triggerd 2");
+ sr_dbg("Device triggerd 2.");
siglent_sds_set_wait_event(devc, WAIT_NONE);
}
return siglent_sds_event_wait(sdi);
}
-/* Wait for scope to got to "Stop" in single shot mode */
+/* Wait for scope to got to "Stop" in single shot mode. */
static int siglent_sds_stop_wait(const struct sr_dev_inst *sdi)
{
-
return siglent_sds_event_wait(sdi);
}
ret = sr_scpi_send_variadic(sdi->conn, format, args);
va_end(args);
- if (ret != SR_OK) {
- return SR_ERR;
- }
-
- return SR_OK;
+ return ret;
}
-/* Start capturing a new frameset */
+/* Start capturing a new frameset. */
SR_PRIV int siglent_sds_capture_start(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
if (out == DEVICE_STATE_TRIG_RDY) {
siglent_sds_set_wait_event(devc, WAIT_TRIGGER);
} else if (out == DEVICE_STATE_TRIG_RDY + 1) {
- sr_spew("Device Triggerd");
+ sr_spew("Device triggered.");
siglent_sds_set_wait_event(devc, WAIT_BLOCK);
return SR_OK;
} else {
- sr_spew("Device did not enter ARM mode");
+ sr_spew("Device did not enter ARM mode.");
return SR_ERR;
}
- } else { //TODO implement History retrieval
+ } else { /* TODO: Implement history retrieval. */
unsigned int framecount;
char buf[200];
int ret;
- sr_dbg("Starting data capture for history frameset");
+ sr_dbg("Starting data capture for history frameset.");
if (siglent_sds_config_set(sdi, "FPAR?") != SR_OK)
return SR_ERR;
ret = sr_scpi_read_data(sdi->conn, buf, 200);
return SR_ERR;
}
memcpy(&framecount, buf + 40, 4);
- if (devc->limit_frames > framecount) {
+ if (devc->limit_frames > framecount)
sr_err("Frame limit higher that frames in buffer of device!");
- } else if (devc->limit_frames == 0) {
+ else if (devc->limit_frames == 0)
devc->limit_frames = framecount;
- }
sr_dbg("Starting data capture for history frameset %" PRIu64 " of %" PRIu64,
devc->num_frames + 1, devc->limit_frames);
if (siglent_sds_config_set(sdi, "FRAM %i", devc->num_frames + 1) != SR_OK)
return SR_OK;
}
-/* Start reading data from the current channel */
+/* Start reading data from the current channel. */
SR_PRIV int siglent_sds_channel_start(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
ch = devc->channel_entry->data;
- sr_dbg("Starting reading data from channel %d", ch->index + 1);
+ sr_dbg("Starting reading data from channel %d.", ch->index + 1);
switch (devc->model->series->protocol) {
case NON_SPO_MODEL:
return SR_OK;
}
-/* Read the header of a data block */
+/* Read the header of a data block. */
static int siglent_sds_read_header(struct sr_dev_inst *sdi, int channelIndex)
{
struct sr_scpi_dev_inst *scpi = sdi->conn;
char *buf = (char *)devc->buffer;
int ret;
int descLength;
- int blockOffset = 15; // Offset for Descriptor block.
+ int blockOffset = 15; /* Offset for descriptor block. */
long dataLength = 0;
- /* Read header from device */
- ret = sr_scpi_read_data(scpi, buf + devc->num_header_bytes, devc->model->series->buffer_samples);
+ /* Read header from device. */
+ ret = sr_scpi_read_data(scpi, buf + devc->num_header_bytes,
+ devc->model->series->buffer_samples);
if (ret < 346) {
sr_err("Read error while reading data header.");
return SR_ERR;
}
- sr_dbg("Device returned %i bytes", ret);
+ sr_dbg("Device returned %i bytes.", ret);
devc->num_header_bytes += ret;
- buf += blockOffset; //Skip to start Descriptor block
+ buf += blockOffset; /* Skip to start descriptor block. */
- // Parse WaveDescriptor Header
- memcpy(&descLength, buf + 36, 4); // Descriptor block length
- memcpy(&dataLength, buf + 60, 4); // Data block length
+ /* Parse WaveDescriptor header. */
+ memcpy(&descLength, 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;
ret = dataLength;
+
sr_dbg("Received data block header: '%s' -> block length %d", buf, ret);
+
return ret;
}
return TRUE;
break;
case WAIT_STOP:
- if (siglent_sds_stop_wait(sdi) != SR_OK) {
+ if (siglent_sds_stop_wait(sdi) != SR_OK)
return TRUE;
- }
- if (siglent_sds_channel_start(sdi) != SR_OK) {
+ if (siglent_sds_channel_start(sdi) != SR_OK)
return TRUE;
- }
return TRUE;
default:
- sr_err("BUG: Unknown event target encountered");
+ sr_err("BUG: Unknown event target encountered.");
break;
}
if (devc->num_block_bytes == 0) {
- if (g_ascii_strcasecmp(memsize, "14M") == 0){
- sr_err("Device memory depth is set to 14Mpts, so please be patient");
- g_usleep(4900000); // Sleep for large memory set
+ if (g_ascii_strcasecmp(memsize, "14M") == 0) {
+ sr_err("Device memory depth is set to 14Mpts, so please be patient.");
+ g_usleep(4900000); /* Sleep for large memory set. */
}
- sr_dbg("New block header expected");
+ sr_dbg("New block header expected.");
len = siglent_sds_read_header(sdi, ch->index);
expected_data_bytes = len;
if (len == 0)
if (devc->data_source == DATA_SOURCE_SCREEN
&& (unsigned)len < expected_data_bytes) {
- sr_dbg("Discarding short data block");
+ sr_dbg("Discarding short data block.");
sr_scpi_read_data(scpi, (char *)devc->buffer, len + 1);
return TRUE;
}
if (len > ACQ_BUFFER_SIZE)
len = ACQ_BUFFER_SIZE;
- /*Offset the data block buffer past the IEEE header and Description Header*/
+ /* Offset the data block buffer past the IEEE header and description header. */
devc->buffer += devc->blockHeaderSize;
if (len == -1) {
}
if (devc->num_block_read == devc->num_block_bytes) {
- sr_dbg("Block has been completed");
- /* Prepare for possible next block */
- sr_dbg("Prepare for possible next block");
+ 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) {
+ 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");
+ sr_err("Read should have been completed.");
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
sdi->driver->dev_acquisition_stop(sdi);
}
devc->num_block_read = 0;
} else {
- sr_dbg("%" PRIu64 " of %" PRIu64 " block bytes read",
+ sr_dbg("%" PRIu64 " of %" PRIu64 " block bytes read.",
devc->num_block_read, devc->num_block_bytes);
}
devc->num_channel_bytes += len;
sr_session_send(sdi, &packet);
}
}
+
return TRUE;
}
if (devc->model->has_digital) {
gboolean status;
- sr_dbg("Check Logic Analyzer channel state");
+ sr_dbg("Check logic analyzer channel state.");
devc->la_enabled = FALSE;
cmd = g_strdup_printf("DGST?");
res = sr_scpi_get_bool(sdi->conn, cmd, &status);
g_free(cmd);
if (res != SR_OK)
return SR_ERR;
- sr_dbg("Logic Analyzer status: %s", status ? "On" : "Off");
+ sr_dbg("Logic analyzer status: %s", status ? "On" : "Off");
if (status) {
devc->la_enabled = TRUE;
for (i = 0; i < ARRAY_SIZE(devc->digital_channels); i++) {
/* Timebase. */
if (sr_scpi_get_float(sdi->conn, ":TDIV?", &devc->timebase) != SR_OK)
return SR_ERR;
- sr_dbg("Current timebase %g", devc->timebase);
+ sr_dbg("Current timebase: %g.", devc->timebase);
/* Probe attenuation. */
for (i = 0; i < devc->model->analog_channels; i++) {
}
g_free(response);
devc->trigger_source = g_strstrip(g_strdup(tokens[2]));
- sr_dbg("Current trigger source %s", devc->trigger_source);
+ sr_dbg("Current trigger source: %s.", devc->trigger_source);
- /* TODO Horizontal trigger position. */
+ /* TODO: Horizontal trigger position. */
devc->horiz_triggerpos = 0;
- sr_dbg("Current horizontal trigger position %g", devc->horiz_triggerpos);
+ sr_dbg("Current horizontal trigger position: %g.", devc->horiz_triggerpos);
/* Trigger slope. */
cmd = g_strdup_printf("%s:TRSL?", devc->trigger_source);
g_free(cmd);
if (res != SR_OK)
return SR_ERR;
- sr_dbg("Current trigger slope %s", devc->trigger_slope);
+ sr_dbg("Current trigger slope: %s.", devc->trigger_slope);
/* Trigger level. */
cmd = g_strdup_printf("%s:TRLV?", devc->trigger_source);
g_free(cmd);
if (res != SR_OK)
return SR_ERR;
- sr_dbg("Current trigger level %g", devc->trigger_level);
+ sr_dbg("Current trigger level: %g.", devc->trigger_level);
return SR_OK;
}
}
samplerateScope = fvalue * 1000;
}
- /* Get the Timebase. */
+ /* 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);
+ sr_dbg("Current timebase: %g.", devc->timebase);
devc->sampleRate = samplerateScope / (devc->timebase * devc->model->series->num_horizontal_divs);
+
return SR_OK;
}
projects / libsigrok.git / commitdiff