X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fprotocol.c;h=77af43e94d3d3af4f7bdc93a693dd9f781d03c61;hb=f9c6b5cfd3c0f6cb737f6a68f69034ce6819f36d;hp=7581472414590e3f227d52bdfaed25f1fc61a055;hpb=dc89faeace016d0fbd8314937d0335a2ae76de14;p=libsigrok.git
diff --git a/src/hardware/rigol-ds/protocol.c b/src/hardware/rigol-ds/protocol.c
index 75814724..77af43e9 100644
--- a/src/hardware/rigol-ds/protocol.c
+++ b/src/hardware/rigol-ds/protocol.c
@@ -19,6 +19,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -28,8 +29,9 @@
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
+#include "scpi.h"
#include "protocol.h"
/*
@@ -219,7 +221,7 @@ static int rigol_ds_check_stop(const struct sr_dev_inst *sdi)
return SR_OK;
if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
- ch->index + 1) != SR_OK)
+ ch->index + 1) != SR_OK)
return SR_ERR;
/* Check that the number of samples will be accepted */
if (rigol_ds_config_set(sdi, ":WAV:POIN %d", devc->analog_frame_size) != SR_OK)
@@ -327,7 +329,7 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi)
if (!(devc = sdi->priv))
return SR_ERR;
- sr_dbg("Starting data capture for frameset %lu of %lu",
+ sr_dbg("Starting data capture for frameset %" PRIu64 " of %" PRIu64,
devc->num_frames + 1, devc->limit_frames);
switch (devc->model->series->protocol) {
@@ -430,7 +432,7 @@ SR_PRIV int rigol_ds_channel_start(const struct sr_dev_inst *sdi)
break;
case PROTOCOL_V3:
if (rigol_ds_config_set(sdi, ":WAV:SOUR CHAN%d",
- ch->index + 1) != SR_OK)
+ ch->index + 1) != SR_OK)
return SR_ERR;
if (devc->data_source != DATA_SOURCE_LIVE) {
if (rigol_ds_config_set(sdi, ":WAV:RES") != SR_OK)
@@ -538,6 +540,9 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
struct dev_context *devc;
struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog;
+ struct sr_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
struct sr_datafeed_logic logic;
double vdiv, offset;
int len, i, vref;
@@ -615,8 +620,8 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
if (len == -1) {
sr_err("Read error, aborting capture.");
packet.type = SR_DF_FRAME_END;
- sr_session_send(cb_data, &packet);
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
+ sr_session_send(sdi, &packet);
+ sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}
/* At slow timebases in live capture the DS2072
@@ -648,8 +653,8 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
if (len == -1) {
sr_err("Read error, aborting capture.");
packet.type = SR_DF_FRAME_END;
- sr_session_send(cb_data, &packet);
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
+ sr_session_send(sdi, &packet);
+ sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}
@@ -667,16 +672,19 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
else
for (i = 0; i < len; i++)
devc->data[i] = (128 - devc->buffer[i]) * vdiv - offset;
- analog.channels = g_slist_append(NULL, ch);
+ float vdivlog = log10f(vdiv);
+ int 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 = len;
analog.data = devc->data;
- analog.mq = SR_MQ_VOLTAGE;
- analog.unit = SR_UNIT_VOLT;
- analog.mqflags = 0;
+ 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(cb_data, &packet);
- g_slist_free(analog.channels);
+ sr_session_send(sdi, &packet);
+ g_slist_free(analog.meaning->channels);
} else {
logic.length = len;
// TODO: For the MSO1000Z series, we need a way to express that
@@ -686,7 +694,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
logic.data = devc->buffer;
packet.type = SR_DF_LOGIC;
packet.payload = &logic;
- sr_session_send(cb_data, &packet);
+ sr_session_send(sdi, &packet);
}
if (devc->num_block_read == devc->num_block_bytes) {
@@ -705,13 +713,14 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
if (!sr_scpi_read_complete(scpi)) {
sr_err("Read should have been completed");
packet.type = SR_DF_FRAME_END;
- sr_session_send(cb_data, &packet);
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
+ sr_session_send(sdi, &packet);
+ sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}
devc->num_block_read = 0;
} else {
- sr_dbg("%d of %d block bytes read", devc->num_block_read, devc->num_block_bytes);
+ sr_dbg("%" PRIu64 " of %" PRIu64 " block bytes read",
+ devc->num_block_read, devc->num_block_bytes);
}
devc->num_channel_bytes += len;
@@ -739,11 +748,11 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
} else {
/* Done with this frame. */
packet.type = SR_DF_FRAME_END;
- sr_session_send(cb_data, &packet);
+ sr_session_send(sdi, &packet);
if (++devc->num_frames == devc->limit_frames) {
/* Last frame, stop capture. */
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
+ sdi->driver->dev_acquisition_stop(sdi);
} else {
/* Get the next frame, starting with the first channel. */
devc->channel_entry = devc->enabled_channels;
@@ -752,7 +761,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
/* Start of next frame. */
packet.type = SR_DF_FRAME_BEGIN;
- sr_session_send(cb_data, &packet);
+ sr_session_send(sdi, &packet);
}
}
@@ -762,6 +771,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
+ struct sr_channel *ch;
char *cmd;
unsigned int i;
int res;
@@ -775,6 +785,8 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
g_free(cmd);
if (res != SR_OK)
return SR_ERR;
+ ch = g_slist_nth_data(sdi->channels, i);
+ ch->enabled = devc->analog_channels[i];
}
sr_dbg("Current analog channel state:");
for (i = 0; i < devc->model->analog_channels; i++)
@@ -797,6 +809,8 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
g_free(cmd);
if (res != SR_OK)
return SR_ERR;
+ ch = g_slist_nth_data(sdi->channels, i + devc->model->analog_channels);
+ ch->enabled = devc->digital_channels[i];
sr_dbg("D%d: %s", i, devc->digital_channels[i] ? "on" : "off");
}
}
@@ -806,29 +820,21 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
return SR_ERR;
sr_dbg("Current timebase %g", devc->timebase);
- /* Vertical gain. */
+ /* Probe attenuation. */
for (i = 0; i < devc->model->analog_channels; i++) {
- cmd = g_strdup_printf(":CHAN%d:SCAL?", i + 1);
- res = sr_scpi_get_float(sdi->conn, cmd, &devc->vdiv[i]);
+ cmd = g_strdup_printf(":CHAN%d:PROB?", i + 1);
+ res = sr_scpi_get_float(sdi->conn, cmd, &devc->attenuation[i]);
g_free(cmd);
if (res != SR_OK)
return SR_ERR;
}
- sr_dbg("Current vertical gain:");
+ sr_dbg("Current probe attenuation:");
for (i = 0; i < devc->model->analog_channels; i++)
- sr_dbg("CH%d %g", i + 1, devc->vdiv[i]);
+ sr_dbg("CH%d %g", i + 1, devc->attenuation[i]);
- /* Vertical offset. */
- for (i = 0; i < devc->model->analog_channels; i++) {
- cmd = g_strdup_printf(":CHAN%d:OFFS?", i + 1);
- res = sr_scpi_get_float(sdi->conn, cmd, &devc->vert_offset[i]);
- g_free(cmd);
- if (res != SR_OK)
- return SR_ERR;
- }
- sr_dbg("Current vertical offset:");
- for (i = 0; i < devc->model->analog_channels; i++)
- sr_dbg("CH%d %g", i + 1, devc->vert_offset[i]);
+ /* Vertical gain and offset. */
+ if (rigol_ds_get_dev_cfg_vertical(sdi) != SR_OK)
+ return SR_ERR;
/* Coupling. */
for (i = 0; i < devc->model->analog_channels; i++) {
@@ -857,5 +863,46 @@ SR_PRIV int rigol_ds_get_dev_cfg(const struct sr_dev_inst *sdi)
return SR_ERR;
sr_dbg("Current trigger slope %s", devc->trigger_slope);
+ /* Trigger level. */
+ if (sr_scpi_get_float(sdi->conn, ":TRIG:EDGE:LEV?", &devc->trigger_level) != SR_OK)
+ return SR_ERR;
+ sr_dbg("Current trigger level %g", devc->trigger_level);
+
+ return SR_OK;
+}
+
+SR_PRIV int rigol_ds_get_dev_cfg_vertical(const struct sr_dev_inst *sdi)
+{
+ struct dev_context *devc;
+ char *cmd;
+ unsigned int i;
+ int res;
+
+ devc = sdi->priv;
+
+ /* Vertical gain. */
+ for (i = 0; i < devc->model->analog_channels; i++) {
+ cmd = g_strdup_printf(":CHAN%d:SCAL?", i + 1);
+ res = sr_scpi_get_float(sdi->conn, cmd, &devc->vdiv[i]);
+ g_free(cmd);
+ if (res != SR_OK)
+ return SR_ERR;
+ }
+ sr_dbg("Current vertical gain:");
+ for (i = 0; i < devc->model->analog_channels; i++)
+ sr_dbg("CH%d %g", i + 1, devc->vdiv[i]);
+
+ /* Vertical offset. */
+ for (i = 0; i < devc->model->analog_channels; i++) {
+ cmd = g_strdup_printf(":CHAN%d:OFFS?", i + 1);
+ res = sr_scpi_get_float(sdi->conn, cmd, &devc->vert_offset[i]);
+ g_free(cmd);
+ if (res != SR_OK)
+ return SR_ERR;
+ }
+ sr_dbg("Current vertical offset:");
+ for (i = 0; i < devc->model->analog_channels; i++)
+ sr_dbg("CH%d %g", i + 1, devc->vert_offset[i]);
+
return SR_OK;
}