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

output/ascii: Support getting samplerate from meta packets.

This commit is contained in:
Bert Vermeulen 2014-04-28 15:11:17 -07:00
parent 7bcbbfae3e
commit 787e9bc970
1 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
output/ascii.c
View File

@ -34,10 +34,12 @@ struct context {
int bit_cnt; int bit_cnt;
int spl_cnt; int spl_cnt;
int trigger; int trigger;
uint64_t samplerate;
int *channel_index; int *channel_index;
char **channel_names; char **channel_names;
char **line_values; char **line_values;
uint8_t *prev_sample; uint8_t *prev_sample;
gboolean header_done;
GString **lines; GString **lines;
GString *header; GString *header;
}; };
@ -47,13 +49,10 @@ static int init(struct sr_output *o)
struct context *ctx; struct context *ctx;
struct sr_channel *ch; struct sr_channel *ch;
GSList *l; GSList *l;
GVariant *gvar;
GHashTableIter iter; GHashTableIter iter;
gpointer key, value; gpointer key, value;
uint64_t samplerate;
unsigned int i, j; unsigned int i, j;
int spl, num_channels; int spl;
char *samplerate_s;
if (!o || !o->sdi) if (!o || !o->sdi)
return SR_ERR_ARG; return SR_ERR_ARG;
@ -104,26 +103,48 @@ static int init(struct sr_output *o)
j++; j++;
} }
ctx->header = g_string_sized_new(512); return SR_OK;
g_string_printf(ctx->header, "%s\n", PACKAGE_STRING); }
num_channels = g_slist_length(o->sdi->channels);
if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE, static GString *gen_header(struct sr_output *o)
&gvar) == SR_OK) { {
samplerate = g_variant_get_uint64(gvar); struct context *ctx;
samplerate_s = sr_samplerate_string(samplerate); GVariant *gvar;
g_string_append_printf(ctx->header, "Acquisition with %d/%d channels at %s\n", GString *header;
ctx->num_enabled_channels, num_channels, samplerate_s); int num_channels;
g_free(samplerate_s); char *samplerate_s;
g_variant_unref(gvar);
ctx = o->internal;
if (ctx->samplerate == 0) {
if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
&gvar) == SR_OK) {
ctx->samplerate = g_variant_get_uint64(gvar);
g_variant_unref(gvar);
}
} }
return SR_OK; header = g_string_sized_new(512);
g_string_printf(header, "%s\n", PACKAGE_STRING);
num_channels = g_slist_length(o->sdi->channels);
g_string_append_printf(header, "Acquisition with %d/%d channels",
ctx->num_enabled_channels, num_channels);
if (ctx->samplerate != 0) {
samplerate_s = sr_samplerate_string(ctx->samplerate);
g_string_append_printf(header, " at %s", samplerate_s);
g_free(samplerate_s);
}
g_string_append_printf(header, "\n");
return header;
} }
static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet, static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
GString **out) GString **out)
{ {
const struct sr_datafeed_meta *meta;
const struct sr_datafeed_logic *logic; const struct sr_datafeed_logic *logic;
const struct sr_config *src;
GSList *l;
struct context *ctx; struct context *ctx;
int idx, offset, curbit, prevbit; int idx, offset, curbit, prevbit;
uint64_t i, j; uint64_t i, j;
@ -136,14 +157,22 @@ static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
return SR_ERR_ARG; return SR_ERR_ARG;
switch (packet->type) { switch (packet->type) {
case SR_DF_META:
meta = packet->payload;
for (l = meta->config; l; l = l->next) {
src = l->data;
if (src->key != SR_CONF_SAMPLERATE)
continue;
ctx->samplerate = g_variant_get_uint64(src->data);
}
break;
case SR_DF_TRIGGER: case SR_DF_TRIGGER:
ctx->trigger = ctx->spl_cnt; ctx->trigger = ctx->spl_cnt;
break; break;
case SR_DF_LOGIC: case SR_DF_LOGIC:
if (ctx->header) { if (!ctx->header_done) {
/* The header is still here, this must be the first packet. */ *out = gen_header(o);
*out = ctx->header; ctx->header_done = TRUE;
ctx->header = NULL;
} else } else
*out = g_string_sized_new(512); *out = g_string_sized_new(512);
@ -215,8 +244,6 @@ static int cleanup(struct sr_output *o)
for (i = 0; i < ctx->num_enabled_channels; i++) for (i = 0; i < ctx->num_enabled_channels; i++)
g_string_free(ctx->lines[i], TRUE); g_string_free(ctx->lines[i], TRUE);
g_free(ctx->lines); g_free(ctx->lines);
if (ctx->header)
g_string_free(ctx->header, TRUE);
g_free(ctx); g_free(ctx);
o->internal = NULL; o->internal = NULL;