GPtrArray *channellist;
};
-static int init(struct sr_output *o)
+static int init(struct sr_output *o, GHashTable *options)
{
struct context *ctx;
struct sr_channel *ch;
GSList *l;
- sr_spew("Initializing output module.");
+ (void)options;
if (!o || !o->sdi)
return SR_ERR_ARG;
sr_err("Output module context malloc failed.");
return SR_ERR_MALLOC;
}
- o->internal = ctx;
+ o->priv = ctx;
/* Get the number of channels and their names. */
ctx->channellist = g_ptr_array_new();
case SR_UNIT_FARAD:
si_printf(value, out, "F");
break;
+ case SR_UNIT_HENRY:
+ si_printf(value, out, "H");
+ break;
case SR_UNIT_KELVIN:
si_printf(value, out, "K");
break;
case SR_UNIT_HUMIDITY_293K:
si_printf(value, out, "%rF");
break;
+ case SR_UNIT_DEGREE:
+ si_printf(value, out, "");
+ g_string_append_unichar(out, 0x00b0);
+ break;
default:
si_printf(value, out, "");
break;
g_string_append_printf(out, " REL");
if (mqflags & SR_MQFLAG_AVG)
g_string_append_printf(out, " AVG");
+ if (mqflags & SR_MQFLAG_REFERENCE)
+ g_string_append_printf(out, " REF");
g_string_append_c(out, '\n');
}
-static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
+static int receive(const struct sr_output *o, const struct sr_datafeed_packet *packet,
GString **out)
{
const struct sr_datafeed_analog *analog;
+ const struct sr_datafeed_analog2 *analog2;
struct sr_channel *ch;
GSList *l;
- const float *fdata;
- int i, p;
+ float *fdata;
+ unsigned int i;
+ int num_channels, c, ret, si;
*out = NULL;
if (!o || !o->sdi)
break;
case SR_DF_ANALOG:
analog = packet->payload;
- fdata = (const float *)analog->data;
+ fdata = (float *)analog->data;
*out = g_string_sized_new(512);
- for (i = 0; i < analog->num_samples; i++) {
- for (l = analog->channels, p = 0; l; l = l->next, p++) {
+ num_channels = g_slist_length(analog->channels);
+ for (si = 0; si < analog->num_samples; si++) {
+ for (l = analog->channels, c = 0; l; l = l->next, c++) {
ch = l->data;
g_string_append_printf(*out, "%s: ", ch->name);
fancyprint(analog->unit, analog->mqflags,
- fdata[i + p], *out);
+ 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);
}
}
break;
if (!o || !o->sdi)
return SR_ERR_ARG;
- ctx = o->internal;
+ ctx = o->priv;
g_ptr_array_free(ctx->channellist, 1);
g_free(ctx);
- o->internal = NULL;
+ o->priv = NULL;
return SR_OK;
}
-SR_PRIV struct sr_output_format output_analog = {
+SR_PRIV struct sr_output_module output_analog = {
.id = "analog",
- .description = "Analog data",
+ .name = "Analog",
+ .desc = "Analog data and types",
+ .options = NULL,
.init = init,
.receive = receive,
.cleanup = cleanup