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

output/analog: Add SR_DF_ANALOG2 support.

This commit is contained in:
Bert Vermeulen 2014-11-12 17:05:13 +01:00 committed by Uwe Hermann
parent fb019a0e4d
commit e02e9e6a1c
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/output/analog.c
View File

@ -228,10 +228,12 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
GString **out) GString **out)
{ {
const struct sr_datafeed_analog *analog; const struct sr_datafeed_analog *analog;
const struct sr_datafeed_analog2 *analog2;
struct sr_channel *ch; struct sr_channel *ch;
GSList *l; GSList *l;
const float *fdata; float *fdata;
int num_channels, i, c; unsigned int i;
int num_channels, c, ret, si;
*out = NULL; *out = NULL;
if (!o || !o->sdi) if (!o || !o->sdi)
@ -246,14 +248,31 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
break; break;
case SR_DF_ANALOG: case SR_DF_ANALOG:
analog = packet->payload; analog = packet->payload;
fdata = (const float *)analog->data; fdata = (float *)analog->data;
*out = g_string_sized_new(512); *out = g_string_sized_new(512);
num_channels = g_slist_length(analog->channels); num_channels = g_slist_length(analog->channels);
for (i = 0; i < analog->num_samples; i++) { for (si = 0; si < analog->num_samples; si++) {
for (l = analog->channels, c = 0; l; l = l->next, c++) { 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[si * num_channels + c], *out);
}
}
break;
case SR_DF_ANALOG2:
analog2 = packet->payload;
if (!(fdata = g_try_malloc(analog2->num_samples * sizeof(float))))
return SR_ERR_MALLOC;
if ((ret = sr_analog_to_float(analog2, fdata)) != SR_OK)
return ret;
*out = g_string_sized_new(512);
num_channels = g_slist_length(analog2->meaning->channels);
for (i = 0; i < analog2->num_samples; i++) {
for (l = analog2->meaning->channels, c = 0; l; l = l->next, c++) {
ch = l->data;
g_string_append_printf(*out, "%s: ", ch->name);
fancyprint(analog2->meaning->unit, analog2->meaning->mqflags,
fdata[i * num_channels + c], *out); fdata[i * num_channels + c], *out);
} }
} }