static const int32_t hwopts[] = {
SR_CONF_CONN,
+ SR_CONF_SERIALCOMM
};
static const int32_t hwcaps[] = {
{"DS2072", RIGOL_DS2000, PROTOCOL_IEEE488_2, {5, 1000000000}, {500, 1}, {500, 1000000}, false, 14},
{"DS2102", RIGOL_DS2000, PROTOCOL_IEEE488_2, {5, 1000000000}, {500, 1}, {500, 1000000}, false, 14},
{"DS2202", RIGOL_DS2000, PROTOCOL_IEEE488_2, {2, 1000000000}, {500, 1}, {500, 1000000}, false, 14},
+ {"VS5022", RIGOL_VS5000, PROTOCOL_LEGACY, {20, 1000000000}, {50, 1}, {2, 1000}, false, 14},
+ {"VS5022D", RIGOL_VS5000, PROTOCOL_LEGACY, {20, 1000000000}, {50, 1}, {2, 1000}, true, 14},
+ {"VS5042", RIGOL_VS5000, PROTOCOL_LEGACY, {10, 1000000000}, {50, 1}, {2, 1000}, false, 14},
+ {"VS5042D", RIGOL_VS5000, PROTOCOL_LEGACY, {10, 1000000000}, {50, 1}, {2, 1000}, true, 14},
+ {"VS5062", RIGOL_VS5000, PROTOCOL_LEGACY, {5, 1000000000}, {50, 1}, {2, 1000}, false, 14},
+ {"VS5062D", RIGOL_VS5000, PROTOCOL_LEGACY, {5, 1000000000}, {50, 1}, {2, 1000}, true, 14},
+ {"VS5102", RIGOL_VS5000, PROTOCOL_LEGACY, {2, 1000000000}, {50, 1}, {2, 1000}, false, 14},
+ {"VS5102D", RIGOL_VS5000, PROTOCOL_LEGACY, {2, 1000000000}, {50, 1}, {2, 1000}, true, 14},
+ {"VS5202", RIGOL_VS5000, PROTOCOL_LEGACY, {2, 1000000000}, {50, 1}, {2, 1000}, false, 14},
+ {"VS5202D", RIGOL_VS5000, PROTOCOL_LEGACY, {2, 1000000000}, {50, 1}, {2, 1000}, true, 14},
};
SR_PRIV struct sr_dev_driver rigol_ds_driver_info;
static int set_cfg(const struct sr_dev_inst *sdi, const char *format, ...)
{
va_list args;
- char buf[256];
+ int ret;
va_start(args, format);
- vsnprintf(buf, 255, format, args);
+ ret = sr_scpi_send_variadic(sdi->conn, format, args);
va_end(args);
- if (rigol_ds_send(sdi, buf) != SR_OK)
+
+ if (ret != SR_OK)
return SR_ERR;
/* When setting a bunch of parameters in a row, the DS1052E scrambles
return std_init(sr_ctx, di, LOG_PREFIX);
}
-static int probe_port(const char *port, GSList **devices)
+static int probe_port(const char *resource, const char *serialcomm, GSList **devices)
{
struct dev_context *devc;
struct sr_dev_inst *sdi;
+ const char *usbtmc_prefix = "/dev/usbtmc";
+ const char *tcp_prefix = "tcp/";
+ gchar **tokens, *address, *port;
struct sr_scpi_dev_inst *scpi;
struct sr_scpi_hw_info *hw_info;
struct sr_probe *probe;
gchar *channel_name;
*devices = NULL;
- if (!(scpi = scpi_usbtmc_dev_inst_new(port)))
- return SR_ERR_MALLOC;
+
+ if (strncmp(resource, usbtmc_prefix, strlen(usbtmc_prefix)) == 0) {
+ sr_dbg("Opening USBTMC device %s.", resource);
+ if (!(scpi = scpi_usbtmc_dev_inst_new(resource)))
+ return SR_ERR_MALLOC;
+ } else if (strncmp(resource, tcp_prefix, strlen(tcp_prefix)) == 0) {
+ sr_dbg("Opening TCP connection %s.", resource);
+ tokens = g_strsplit(resource + strlen(tcp_prefix), "/", 0);
+ address = tokens[0];
+ port = tokens[1];
+ if (!address || !port || tokens[2]) {
+ sr_err("Invalid parameters.");
+ g_strfreev(tokens);
+ return SR_ERR_ARG;
+ }
+ scpi = scpi_tcp_dev_inst_new(address, port);
+ g_strfreev(tokens);
+ if (!scpi)
+ return SR_ERR_MALLOC;
+ } else {
+ sr_dbg("Opening serial device %s.", resource);
+ if (!(scpi = scpi_serial_dev_inst_new(resource, serialcomm)))
+ return SR_ERR_MALLOC;
+ }
if (sr_scpi_open(scpi) != SR_OK) {
sr_scpi_free(scpi);
if (strcasecmp(hw_info->manufacturer, "Rigol Technologies")) {
sr_scpi_hw_info_free(hw_info);
+ sr_scpi_close(scpi);
sr_scpi_free(scpi);
return SR_ERR_NA;
}
hw_info->manufacturer, hw_info->model,
hw_info->firmware_version))) {
sr_scpi_hw_info_free(hw_info);
+ sr_scpi_close(scpi);
sr_scpi_free(scpi);
return SR_ERR_NA;
}
sr_scpi_hw_info_free(hw_info);
+ sr_scpi_close(scpi);
sdi->conn = scpi;
int ret;
const gchar *dev_name;
gchar *port = NULL;
+ gchar *serialcomm = NULL;
drvc = di->priv;
for (l = options; l; l = l->next) {
src = l->data;
- if (src->key == SR_CONF_CONN) {
+ switch (src->key) {
+ case SR_CONF_CONN:
port = (char *)g_variant_get_string(src->data, NULL);
break;
+ case SR_CONF_SERIALCOMM:
+ serialcomm = (char *)g_variant_get_string(src->data, NULL);
+ break;
}
}
devices = NULL;
if (port) {
- if (probe_port(port, &devices) == SR_ERR_MALLOC)
+ if (probe_port(port, serialcomm, &devices) == SR_ERR_MALLOC) {
+ g_free(port);
+ if (serialcomm)
+ g_free(serialcomm);
return NULL;
+ }
} else {
if (!(dir = g_dir_open("/sys/class/usbmisc/", 0, NULL)))
if (!(dir = g_dir_open("/sys/class/usb/", 0, NULL)))
if (strncmp(dev_name, "usbtmc", 6))
continue;
port = g_strconcat("/dev/", dev_name, NULL);
- ret = probe_port(port, &devices);
+ ret = probe_port(port, serialcomm, &devices);
g_free(port);
+ if (serialcomm)
+ g_free(serialcomm);
if (ret == SR_ERR_MALLOC) {
g_dir_close(dir);
return NULL;
devc = sdi->priv;
if (devc->data_source == DATA_SOURCE_LIVE) {
- if (rigol_ds_send(sdi, ":RUN") != SR_OK)
+ if (sr_scpi_send(sdi->conn, ":RUN") != SR_OK)
return SR_ERR;
} else if (devc->data_source == DATA_SOURCE_MEMORY) {
if (devc->model->series != RIGOL_DS2000) {
/* Enabled channel is currently disabled, or vice versa. */
sprintf(cmd, ":CHAN%d:DISP %s", probe->index + 1,
probe->enabled ? "ON" : "OFF");
- if (rigol_ds_send(sdi, cmd) != SR_OK)
+ if (sr_scpi_send(sdi->conn, cmd) != SR_OK)
return SR_ERR;
}
} else if (probe->type == SR_PROBE_LOGIC) {
/* Enabled channel is currently disabled, or vice versa. */
sprintf(cmd, ":DIG%d:TURN %s", probe->index,
probe->enabled ? "ON" : "OFF");
- if (rigol_ds_send(sdi, cmd) != SR_OK)
+ if (sr_scpi_send(sdi->conn, cmd) != SR_OK)
return SR_ERR;
}
}
std_session_send_df_header(cb_data, LOG_PREFIX);
if (devc->model->protocol == PROTOCOL_LEGACY) {
+ devc->analog_frame_size = DS1000_ANALOG_LIVE_WAVEFORM_SIZE;
/* Fetch the first frame. */
- if (devc->enabled_analog_probes) {
- devc->analog_frame_size = DS1000_ANALOG_LIVE_WAVEFORM_SIZE;
- devc->channel_frame = devc->enabled_analog_probes->data;
- if (rigol_ds_send(sdi, ":WAV:DATA? CHAN%d",
- devc->channel_frame->index + 1) != SR_OK)
- return SR_ERR;
- } else {
- devc->channel_frame = devc->enabled_digital_probes->data;
- if (rigol_ds_send(sdi, ":WAV:DATA? DIG") != SR_OK)
- return SR_ERR;
- }
-
- devc->num_frame_bytes = 0;
+ if (devc->enabled_analog_probes)
+ devc->channel = devc->enabled_analog_probes->data;
+ else
+ devc->channel = devc->enabled_digital_probes->data;
+ if (rigol_ds_channel_start(sdi) != SR_OK)
+ return SR_ERR;
} else {
if (devc->enabled_analog_probes) {
if (devc->data_source == DATA_SOURCE_MEMORY)
/* Apparently for the DS2000 the memory
* depth can only be set in Running state -
* this matches the behaviour of the UI. */
- if (rigol_ds_send(sdi, ":RUN") != SR_OK)
+ if (sr_scpi_send(sdi->conn, ":RUN") != SR_OK)
return SR_ERR;
- if (rigol_ds_send(sdi, "ACQ:MDEP %d", devc->analog_frame_size) != SR_OK)
+ if (sr_scpi_send(sdi->conn, "ACQ:MDEP %d", devc->analog_frame_size) != SR_OK)
return SR_ERR;
- if (rigol_ds_send(sdi, ":STOP") != SR_OK)
+ if (sr_scpi_send(sdi->conn, ":STOP") != SR_OK)
return SR_ERR;
} else
devc->analog_frame_size = DS2000_ANALOG_LIVE_WAVEFORM_SIZE;
- devc->channel_frame = devc->enabled_analog_probes->data;
+ devc->channel = devc->enabled_analog_probes->data;
if (rigol_ds_capture_start(sdi) != SR_OK)
return SR_ERR;
}