Add pretty-printer for new units and flags.

[libsigrok.git] / src / output / analog.c

diff --git a/src/output/analog.c b/src/output/analog.c
index fbc41d88ffa9e52e1f010fcd705aeca52b203f16..f984bc1850e91112f90ee10f16ea43328d93d4b9 100644 (file)
--- a/src/output/analog.c
+++ b/src/output/analog.c
@@ -31,13 +31,13 @@ struct context {
        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;
@@ -46,7 +46,7 @@ static int init(struct sr_output *o)
                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();
@@ -105,6 +105,9 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
        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;
@@ -187,6 +190,10 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
        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;
@@ -212,17 +219,23 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
                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");
+       if (mqflags & SR_MQFLAG_AUTOMQ)
+               g_string_append_printf(out, " AUTOMQ");
+       if (mqflags & SR_MQFLAG_AUTOMODEL)
+               g_string_append_printf(out, " AUTOMODEL");
        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;
        struct sr_channel *ch;
        GSList *l;
        const float *fdata;
-       int i, p;
+       int num_channels, i, c;
 
        *out = NULL;
        if (!o || !o->sdi)
@@ -239,12 +252,13 @@ static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
                analog = packet->payload;
                fdata = (const float *)analog->data;
                *out = g_string_sized_new(512);
+               num_channels = g_slist_length(analog->channels);
                for (i = 0; i < analog->num_samples; i++) {
-                       for (l = analog->channels, p = 0; l; l = l->next, p++) {
+                       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[i * num_channels + c], *out);
                        }
                }
                break;
@@ -259,18 +273,20 @@ static int cleanup(struct sr_output *o)
 
        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