BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rigol-ds1xx2: better debugging

This commit is contained in:
Bert Vermeulen 2013-04-08 01:12:42 +02:00
parent 75d8a4e576
commit a3df166f02
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hardware/rigol-ds1xx2/api.c
View File

@ -351,12 +351,12 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
break; break;
case SR_CONF_TRIGGER_SLOPE: case SR_CONF_TRIGGER_SLOPE:
tmp_u64 = g_variant_get_uint64(data); tmp_u64 = g_variant_get_uint64(data);
rigol_ds1xx2_send_data(devc->fd, ":TRIG:EDGE:SLOP %s\n", rigol_ds1xx2_send_data(devc->fd, ":TRIG:EDGE:SLOP %s",
tmp_u64 ? "POS" : "NEG"); tmp_u64 ? "POS" : "NEG");
break; break;
case SR_CONF_HORIZ_TRIGGERPOS: case SR_CONF_HORIZ_TRIGGERPOS:
tmp_double = g_variant_get_double(data); tmp_double = g_variant_get_double(data);
rigol_ds1xx2_send_data(devc->fd, ":TIM:OFFS %.9f\n", tmp_double); rigol_ds1xx2_send_data(devc->fd, ":TIM:OFFS %.9f", tmp_double);
break; break;
case SR_CONF_TIMEBASE: case SR_CONF_TIMEBASE:
g_variant_get(data, "(tt)", &p, &q); g_variant_get(data, "(tt)", &p, &q);
@ -368,7 +368,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
} }
} }
if (tmp_int >= 0) if (tmp_int >= 0)
rigol_ds1xx2_send_data(devc->fd, ":TIM:SCAL %.9f\n", rigol_ds1xx2_send_data(devc->fd, ":TIM:SCAL %.9f",
(float)timebases[i][0] / timebases[i][1]); (float)timebases[i][0] / timebases[i][1]);
break; break;
case SR_CONF_TRIGGER_SOURCE: case SR_CONF_TRIGGER_SOURCE:
@ -385,7 +385,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
ret = SR_ERR_ARG; ret = SR_ERR_ARG;
break; break;
} }
rigol_ds1xx2_send_data(devc->fd, ":TRIG:EDGE:SOUR %s\n", channel); rigol_ds1xx2_send_data(devc->fd, ":TRIG:EDGE:SOUR %s", channel);
break; break;
case SR_CONF_VDIV: case SR_CONF_VDIV:
g_variant_get(data, "(tt)", &p, &q); g_variant_get(data, "(tt)", &p, &q);
@ -394,9 +394,9 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
if (vdivs[i][0] != p || vdivs[i][1] != q) if (vdivs[i][0] != p || vdivs[i][1] != q)
continue; continue;
devc->scale = (float)vdivs[i][0] / vdivs[i][1]; devc->scale = (float)vdivs[i][0] / vdivs[i][1];
rigol_ds1xx2_send_data(devc->fd, ":CHAN0:SCAL %.3f\n", rigol_ds1xx2_send_data(devc->fd, ":CHAN0:SCAL %.3f",
devc->scale); devc->scale);
rigol_ds1xx2_send_data(devc->fd, ":CHAN1:SCAL %.3f\n", rigol_ds1xx2_send_data(devc->fd, ":CHAN1:SCAL %.3f",
devc->scale); devc->scale);
break; break;
} }
@ -408,9 +408,9 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
tmp_str = g_variant_get_string(data, NULL); tmp_str = g_variant_get_string(data, NULL);
for (i = 0; i < ARRAY_SIZE(coupling); i++) { for (i = 0; i < ARRAY_SIZE(coupling); i++) {
if (!strcmp(tmp_str, coupling[i])) { if (!strcmp(tmp_str, coupling[i])) {
rigol_ds1xx2_send_data(devc->fd, ":CHAN0:COUP %s\n", rigol_ds1xx2_send_data(devc->fd, ":CHAN0:COUP %s",
coupling[i]); coupling[i]);
rigol_ds1xx2_send_data(devc->fd, ":CHAN1:COUP %s\n", rigol_ds1xx2_send_data(devc->fd, ":CHAN1:COUP %s",
coupling[i]); coupling[i]);
break; break;
} }
@ -494,17 +494,17 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
/* Hardcoded to CH1 only. */ /* Hardcoded to CH1 only. */
devc->enabled_probes = g_slist_append(NULL, sdi->probes->data); devc->enabled_probes = g_slist_append(NULL, sdi->probes->data);
rigol_ds1xx2_send_data(devc->fd, ":CHAN1:SCAL?\n"); rigol_ds1xx2_send_data(devc->fd, ":CHAN1:SCAL?");
len = read(devc->fd, buf, sizeof(buf)); len = read(devc->fd, buf, sizeof(buf));
buf[len] = 0; buf[len] = 0;
devc->scale = atof(buf); devc->scale = atof(buf);
sr_dbg("Scale is %.3f.", devc->scale); sr_dbg("Scale is %.3f.", devc->scale);
rigol_ds1xx2_send_data(devc->fd, ":CHAN1:OFFS?\n"); rigol_ds1xx2_send_data(devc->fd, ":CHAN1:OFFS?");
len = read(devc->fd, buf, sizeof(buf)); len = read(devc->fd, buf, sizeof(buf));
buf[len] = 0; buf[len] = 0;
devc->offset = atof(buf); devc->offset = atof(buf);
sr_dbg("Offset is %.6f.", devc->offset); sr_dbg("Offset is %.6f.", devc->offset);
rigol_ds1xx2_send_data(devc->fd, ":WAV:DATA?\n"); rigol_ds1xx2_send_data(devc->fd, ":WAV:DATA?");
return SR_OK; return SR_OK;
} }

20
hardware/rigol-ds1xx2/protocol.c
View File

@ -21,6 +21,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <string.h>
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include "libsigrok.h"
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
@ -74,7 +75,7 @@ SR_PRIV int rigol_ds1xx2_receive_data(int fd, int revents, void *cb_data)
if (++devc->num_frames == devc->limit_frames) if (++devc->num_frames == devc->limit_frames)
sdi->driver->dev_acquisition_stop(sdi, cb_data); sdi->driver->dev_acquisition_stop(sdi, cb_data);
else else
rigol_ds1xx2_send_data(fd, ":WAV:DATA?\n"); rigol_ds1xx2_send_data(fd, ":WAV:DATA?");
} }
} }
@ -85,13 +86,22 @@ SR_PRIV int rigol_ds1xx2_send_data(int fd, const char *format, ...)
{ {
va_list args; va_list args;
char buf[256]; char buf[256];
int len; int len, out, ret;
va_start(args, format); va_start(args, format);
len = vsprintf(buf, format, args); len = vsprintf(buf, format, args);
va_end(args); va_end(args);
len = write(fd, buf, len); strcat(buf, "\n");
sr_dbg("Sent '%s'.", buf); len++;
out = write(fd, buf, len);
buf[len - 1] = '\0';
if (out != len) {
sr_dbg("Only sent %d/%d bytes of '%s'.", out, len, buf);
ret = SR_ERR;
} else {
sr_dbg("Sent '%s'.", buf);
ret = SR_OK;
}
return len; return ret;
} }