Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Siglent SDS E-series Support #247

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add Siglent SDS E-series Support #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1fe6167
siglent-sds: Add new e-series models: SDS1104X-U, SDS2202X-E, SDS2352X-E
voneiden Feb 5, 2021
e4eb148
siglent-sds: Rewrite eseries acquisition logic
voneiden Feb 5, 2021
64584dc
Added product code for SDS1104X-U
iommu Oct 2, 2021
656d7f6
sort siglent udev entries
mike42 Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion contrib/60-libsigrok.rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,11 @@ ATTRS{idVendor}=="21a9", ATTRS{idProduct}=="1005", ENV{ID_SIGROK}="1"
ATTRS{idVendor}=="21a9", ATTRS{idProduct}=="1006", ENV{ID_SIGROK}="1"

# Siglent USBTMC devices.
# f4ec:ee3a: E.g. SDS1052DL+ scope
# f4ec:1012: E.g. SDS1104X-U scope
# f4ec:ee38: E.g. SDS1104X-E scope or SDM3055 Multimeter
# f4ec:ee3a: E.g. SDS1052DL+ scope
# f4ed:ee3a: E.g. SDS1202X-E scope or SDG1010 waveform generator
ATTRS{idVendor}=="f4ec", ATTRS{idProduct}=="1012", ENV{ID_SIGROK}="1"
ATTRS{idVendor}=="f4ec", ATTRS{idProduct}=="ee38", ENV{ID_SIGROK}="1"
ATTRS{idVendor}=="f4ec", ATTRS{idProduct}=="ee3a", ENV{ID_SIGROK}="1"
ATTRS{idVendor}=="f4ed", ATTRS{idProduct}=="ee3a", ENV{ID_SIGROK}="1"
Expand Down
121 changes: 102 additions & 19 deletions src/hardware/siglent-sds/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ static const uint32_t devopts[] = {
SR_CONF_AVG_SAMPLES | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};

static const uint32_t eseries_devopts[] = {
SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_LIST,
SR_CONF_NUM_HDIV | SR_CONF_GET | SR_CONF_LIST,
SR_CONF_SAMPLERATE | SR_CONF_GET,
SR_CONF_LIMIT_FRAMES | SR_CONF_GET | SR_CONF_SET,
SR_CONF_DATA_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};

static const uint32_t devopts_cg_analog[] = {
SR_CONF_NUM_VDIV | SR_CONF_GET,
SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
Expand Down Expand Up @@ -159,6 +167,13 @@ static const char *data_sources[] = {
"History",
};

/* Do not change the order of entries. */
static const char *eseries_data_sources[] = {
"Single",
"History",
"Read-only",
};

enum vendor {
SIGLENT,
};
Expand All @@ -170,7 +185,9 @@ enum series {
SDS1000X,
SDS1000XP,
SDS1000XE,
SDS1000XU,
SDS2000X,
SDS2000XE,
};

/* short name, full name */
Expand All @@ -194,8 +211,12 @@ static const struct siglent_sds_series supported_series[] = {
{ 50, 1 }, { 500, 100000 }, 14, 8, 14000363},
[SDS1000XE] = {VENDOR(SIGLENT), "SDS1000XE", ESERIES,
{ 50, 1 }, { 500, 100000 }, 14, 8, 14000363},
[SDS1000XU] = {VENDOR(SIGLENT), "SDS1000XU", ESERIES,
{ 50, 1 }, { 500, 100000 }, 14, 8, 14000363},
[SDS2000X] = {VENDOR(SIGLENT), "SDS2000X", SPO_MODEL,
{ 50, 1 }, { 500, 100000 }, 14, 8, 14000363},
[SDS2000XE] = {VENDOR(SIGLENT), "SDS2000XE", ESERIES,
{ 50, 1 }, { 500, 100000 }, 14, 8, 28000363},
};

#define SERIES(x) &supported_series[x]
Expand All @@ -219,6 +240,7 @@ static const struct siglent_sds_model supported_models[] = {
{ 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(SDS1000XU), "SDS1104X-U", { 1, 1000000000 }, 4, FALSE, 0},
{ SERIES(SDS2000X), "SDS2072X", { 2, 1000000000 }, 2, FALSE, 0 },
{ SERIES(SDS2000X), "SDS2074X", { 2, 1000000000 }, 4, FALSE, 0 },
{ SERIES(SDS2000X), "SDS2102X", { 2, 1000000000 }, 2, FALSE, 0 },
Expand All @@ -227,6 +249,8 @@ static const struct siglent_sds_model supported_models[] = {
{ 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(SDS2000XE), "SDS2202X-E", { 2, 1000000000 }, 2, FALSE, 0 },
{ SERIES(SDS2000XE), "SDS2352X-E", { 2, 1000000000 }, 2, FALSE, 0 },
};

static struct sr_dev_driver siglent_sds_driver_info;
Expand Down Expand Up @@ -295,6 +319,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
devc = g_malloc0(sizeof(struct dev_context));
devc->limit_frames = 1;
devc->model = model;
devc->acq_error = FALSE;

sr_scpi_hw_info_free(hw_info);

Expand Down Expand Up @@ -343,7 +368,14 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
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;
switch (devc->model->series->protocol) {
case ESERIES:
devc->data_source = DATA_SOURCE_SINGLE;
break;
default:
devc->data_source = DATA_SOURCE_SCREEN;
break;
}

sdi->priv = devc;

Expand Down Expand Up @@ -423,16 +455,27 @@ static int config_get(uint32_t key, GVariant **data,
*data = g_variant_new_uint64(devc->limit_frames);
break;
case SR_CONF_DATA_SOURCE:
if (devc->data_source == DATA_SOURCE_SCREEN)
switch (devc->data_source) {
case DATA_SOURCE_SCREEN:
*data = g_variant_new_string("Screen");
else if (devc->data_source == DATA_SOURCE_HISTORY)
break;
case DATA_SOURCE_HISTORY:
*data = g_variant_new_string("History");
break;
case DATA_SOURCE_SINGLE:
*data = g_variant_new_string("Single");
break;
case DATA_SOURCE_READ_ONLY:
*data = g_variant_new_string("Read-only");
break;
}
break;
case SR_CONF_SAMPLERATE:
siglent_sds_get_dev_cfg_horizontal(sdi);
*data = g_variant_new_uint64(devc->samplerate);
break;
case SR_CONF_TRIGGER_SOURCE:
// TODO support CH3, CH4?
if (!strcmp(devc->trigger_source, "ACL"))
tmp_str = "AC Line";
else if (!strcmp(devc->trigger_source, "CHAN1"))
Expand Down Expand Up @@ -599,6 +642,7 @@ static int config_set(uint32_t key, GVariant *data,
g_free(cmd);
return ret;
case SR_CONF_TRIGGER_SOURCE:
// TODO should only set channels that are enabled?
if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_sources))) < 0)
return SR_ERR_ARG;
g_free(devc->trigger_source);
Expand Down Expand Up @@ -670,14 +714,31 @@ static int config_set(uint32_t key, GVariant *data,
return ret;
case SR_CONF_DATA_SOURCE:
tmp_str = g_variant_get_string(data, NULL);
if (!strcmp(tmp_str, "Display"))
devc->data_source = DATA_SOURCE_SCREEN;
else if (devc->model->series->protocol >= SPO_MODEL
&& !strcmp(tmp_str, "History"))
devc->data_source = DATA_SOURCE_HISTORY;
else {
sr_err("Unknown data source: '%s'.", tmp_str);
return SR_ERR;
switch (devc->model->series->protocol) {
case ESERIES:
if (!strcmp(tmp_str, "Single"))
devc->data_source = DATA_SOURCE_SINGLE;
else if (!strcmp(tmp_str, "History"))
devc->data_source = DATA_SOURCE_HISTORY;
else if (!strcmp(tmp_str, "Read-only"))
devc->data_source = DATA_SOURCE_READ_ONLY;
else {
sr_err("Unknown data source: '%s'.", tmp_str);
return SR_ERR;
}
break;

default:
if (!strcmp(tmp_str, "Display"))
devc->data_source = DATA_SOURCE_SCREEN;
else if (devc->model->series->protocol >= SPO_MODEL
&& !strcmp(tmp_str, "History"))
devc->data_source = DATA_SOURCE_HISTORY;
else {
sr_err("Unknown data source: '%s'.", tmp_str);
return SR_ERR;
}
break;
}
break;
case SR_CONF_SAMPLERATE:
Expand Down Expand Up @@ -709,10 +770,16 @@ static int config_list(uint32_t key, GVariant **data,
switch (key) {
case SR_CONF_SCAN_OPTIONS:
case SR_CONF_DEVICE_OPTIONS:
if (!cg)
if (!cg) {
if (devc && devc->model->series->protocol == ESERIES) {
return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, eseries_devopts);
}
return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
}

if (!devc)
return SR_ERR_ARG;

if (cg == devc->digital_group) {
*data = std_gvar_array_u32(NULL, 0);
return SR_OK;
Expand Down Expand Up @@ -750,6 +817,7 @@ static int config_list(uint32_t key, GVariant **data,
*data = std_gvar_tuple_array(devc->timebases, devc->num_timebases);
break;
case SR_CONF_TRIGGER_SOURCE:
// TODO ESERIES list only channels that are enabled
if (!devc)
/* Can't know this until we have the exact model. */
return SR_ERR_ARG;
Expand All @@ -769,9 +837,11 @@ static int config_list(uint32_t key, GVariant **data,
*data = g_variant_new_strv(data_sources, ARRAY_SIZE(data_sources) - 1);
break;
case SPO_MODEL:
case ESERIES:
*data = g_variant_new_strv(ARRAY_AND_SIZE(data_sources));
break;
case ESERIES:
*data = g_variant_new_strv(ARRAY_AND_SIZE(eseries_data_sources));
break;
}
break;
case SR_CONF_NUM_HDIV:
Expand Down Expand Up @@ -856,7 +926,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)

// devc->analog_frame_size = devc->model->series->buffer_samples;
// devc->digital_frame_size = devc->model->series->buffer_samples;

siglent_sds_get_dev_cfg_horizontal(sdi);
switch (devc->model->series->protocol) {
case SPO_MODEL:
Expand All @@ -880,16 +949,30 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
default:
break;
}
switch (devc->model->series->protocol) {
case ESERIES:
devc->acq_state = ACQ_SETUP;
devc->retry_count = 0;
sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 10,
siglent_sds_eseries_receive, (void *) sdi);
break;
default:
sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 7000,
siglent_sds_receive, (void *) sdi);
break;
}

sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 7000,
siglent_sds_receive, (void *) sdi);

std_session_send_df_header(sdi);

devc->channel_entry = devc->enabled_channels;

if (siglent_sds_capture_start(sdi) != SR_OK)
return SR_ERR;
switch (devc->model->series->protocol) {
case ESERIES:
break;
default:
if (siglent_sds_capture_start(sdi) != SR_OK)
return SR_ERR;
}

/* Start of first frame. */
std_session_send_df_frame_begin(sdi);
Expand Down
Loading