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

output/analog: Fix channel deinterleaving.

This commit is contained in:
Bert Vermeulen 2014-08-01 11:57:59 +02:00
parent 0605f87475
commit 6e6babb9d5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/output/analog.c
View File

@ -222,7 +222,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
struct sr_channel *ch; struct sr_channel *ch;
GSList *l; GSList *l;
const float *fdata; const float *fdata;
int i, p; int num_channels, i, c;
*out = NULL; *out = NULL;
if (!o || !o->sdi) if (!o || !o->sdi)
@ -239,12 +239,13 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
analog = packet->payload; analog = packet->payload;
fdata = (const float *)analog->data; fdata = (const float *)analog->data;
*out = g_string_sized_new(512); *out = g_string_sized_new(512);
num_channels = g_slist_length(analog->channels);
for (i = 0; i < analog->num_samples; i++) { for (i = 0; i < analog->num_samples; i++) {
for (l = analog->channels, p = 0; l; l = l->next, p++) { for (l = analog->channels, c = 0; l; l = l->next, c++) {
ch = l->data; ch = l->data;
g_string_append_printf(*out, "%s: ", ch->name); g_string_append_printf(*out, "%s: ", ch->name);
fancyprint(analog->unit, analog->mqflags, fancyprint(analog->unit, analog->mqflags,
fdata[i + p], *out); fdata[i * num_channels + c], *out);
} }
} }
break; break;