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

output/analog: Drop support for SR_DF_ANALOG_OLD.

This commit is contained in:
Uwe Hermann 2016-05-14 16:26:04 +02:00
parent 5379fea5ef
commit 23bdb1c997
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/output/analog.c
View File

@ -282,13 +282,12 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
GString **out) GString **out)
{ {
struct context *ctx; struct context *ctx;
const struct sr_datafeed_analog_old *analog_old;
const struct sr_datafeed_analog *analog; const struct sr_datafeed_analog *analog;
struct sr_channel *ch; struct sr_channel *ch;
GSList *l; GSList *l;
float *fdata; float *fdata;
unsigned int i; unsigned int i;
int num_channels, c, ret, si, digits; int num_channels, c, ret, digits;
char *number, *suffix; char *number, *suffix;
*out = NULL; *out = NULL;
@ -303,20 +302,6 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
case SR_DF_FRAME_END: case SR_DF_FRAME_END:
*out = g_string_new("FRAME-END\n"); *out = g_string_new("FRAME-END\n");
break; break;
case SR_DF_ANALOG_OLD:
analog_old = packet->payload;
fdata = (float *)analog_old->data;
*out = g_string_sized_new(512);
num_channels = g_slist_length(analog_old->channels);
for (si = 0; si < analog_old->num_samples; si++) {
for (l = analog_old->channels, c = 0; l; l = l->next, c++) {
ch = l->data;
g_string_append_printf(*out, "%s: ", ch->name);
fancyprint(analog_old->unit, analog_old->mqflags,
fdata[si * num_channels + c], *out);
}
}
break;
case SR_DF_ANALOG: case SR_DF_ANALOG:
analog = packet->payload; analog = packet->payload;
num_channels = g_slist_length(analog->meaning->channels); num_channels = g_slist_length(analog->meaning->channels);