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

output/csv: Support SR_DF_ANALOG2.

This commit is contained in:
Martin Ling 2015-09-10 00:19:23 +01:00 committed by Uwe Hermann
parent b73cac758e
commit 453629c137
1 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/output/csv.c
View File

@ -164,24 +164,24 @@ static void init_output(GString **out, struct context *ctx,
} }
} }
static void handle_analog_frame(struct context *ctx, static void handle_analog_frame(struct context *ctx, GSList *channels,
const struct sr_datafeed_analog *analog) unsigned int num_samples, float *data)
{ {
unsigned int numch, nums, i, j, s; unsigned int numch, nums, i, j, s;
GSList *l; GSList *l;
numch = g_slist_length(analog->channels); numch = g_slist_length(channels);
if ((unsigned int)analog->num_samples > numch) if (num_samples > numch)
nums = analog->num_samples / numch; nums = num_samples / numch;
else else
nums = 1; nums = 1;
s = 0; s = 0;
l = analog->channels; l = channels;
for (i = 0; i < nums; i++) { for (i = 0; i < nums; i++) {
for (j = 0; j < ctx->num_analog_channels; j++) { for (j = 0; j < ctx->num_analog_channels; j++) {
if (ctx->analog_channels[j] == l->data) if (ctx->analog_channels[j] == l->data)
ctx->analog_vals[j] = analog->data[s++]; ctx->analog_vals[j] = data[s++];
} }
l = l->next; l = l->next;
} }
@ -193,8 +193,11 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
const struct sr_datafeed_meta *meta; const struct sr_datafeed_meta *meta;
const struct sr_datafeed_logic *logic; const struct sr_datafeed_logic *logic;
const struct sr_datafeed_analog *analog; const struct sr_datafeed_analog *analog;
const struct sr_datafeed_analog2 *analog2;
const struct sr_config *src; const struct sr_config *src;
GSList *l; unsigned int num_samples;
float *data;
GSList *l, *channels;
struct context *ctx; struct context *ctx;
int idx; int idx;
uint64_t i, j, k, nums, numch; uint64_t i, j, k, nums, numch;
@ -266,10 +269,27 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
} }
break; break;
case SR_DF_ANALOG: case SR_DF_ANALOG:
case SR_DF_ANALOG2:
analog = packet->payload; analog = packet->payload;
analog2 = packet->payload;
if (packet->type == SR_DF_ANALOG) {
channels = analog->channels;
numch = g_slist_length(channels);
num_samples = analog->num_samples;
data = analog->data;
} else {
channels = analog2->meaning->channels;
numch = g_slist_length(channels);
num_samples = analog2->num_samples;
data = g_malloc(sizeof(float) * num_samples * numch);
ret = sr_analog_to_float(analog2, data);
if (ret != SR_OK)
return ret;
}
if (ctx->inframe) { if (ctx->inframe) {
handle_analog_frame(ctx, analog); handle_analog_frame(ctx, channels, num_samples, data);
break; break;
} }
@ -277,9 +297,8 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
k = 0; k = 0;
l = NULL; l = NULL;
numch = g_slist_length(analog->channels); if (num_samples > numch)
if ((unsigned int)analog->num_samples > numch) nums = num_samples / numch;
nums = analog->num_samples / numch;
else else
nums = 1; nums = 1;
@ -287,11 +306,11 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
for (j = 0; j < ctx->num_enabled_channels; j++) { for (j = 0; j < ctx->num_enabled_channels; j++) {
if (ctx->channels[j]->type == SR_CHANNEL_ANALOG) { if (ctx->channels[j]->type == SR_CHANNEL_ANALOG) {
if (!l) if (!l)
l = analog->channels; l = channels;
if (ctx->channels[j] == l->data) { if (ctx->channels[j] == l->data) {
g_string_append_printf(*out, g_string_append_printf(*out,
"%f", analog->data[k++]); "%f", data[k++]);
} }
l = l->next; l = l->next;
@ -302,7 +321,6 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
g_string_append_printf(*out, "\n"); g_string_append_printf(*out, "\n");
} }
break; break;
/* TODO case SR_DF_ANALOG2: */
} }
return ret; return ret;