output/analog: Add option to restrict number of decimal digits printed.

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

diff --git a/src/output/analog.c b/src/output/analog.c
index f81e683c7665a7acd3481a73994774a2aaaf98e3..16ae0bd32f620453ce1bd85a397fb13551bea1be 100644 (file)
--- a/src/output/analog.c
+++ b/src/output/analog.c
@@ -29,6 +29,12 @@
 struct context {
        int num_enabled_channels;
        GPtrArray *channellist;
+       int digits;
+};
+
+enum {
+       DIGITS_ALL,
+       DIGITS_SPEC,
 };
 
 static int init(struct sr_output *o, GHashTable *options)
@@ -36,17 +42,17 @@ static int init(struct sr_output *o, GHashTable *options)
        struct context *ctx;
        struct sr_channel *ch;
        GSList *l;
-
-       (void)options;
+       const char *s;
 
        if (!o || !o->sdi)
                return SR_ERR_ARG;
 
-       if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
-               sr_err("Output module context malloc failed.");
-               return SR_ERR_MALLOC;
-       }
-       o->internal = ctx;
+       o->priv = ctx = g_try_malloc0(sizeof(struct context));
+       s = g_variant_get_string(g_hash_table_lookup(options, "digits"), NULL);
+       if (!strcmp(s, "all"))
+               ctx->digits = DIGITS_ALL;
+       else
+               ctx->digits = DIGITS_SPEC;
 
        /* Get the number of channels and their names. */
        ctx->channellist = g_ptr_array_new();
@@ -105,6 +111,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 +196,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,21 +225,28 @@ 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");
        g_string_append_c(out, '\n');
 }
 
 static int receive(const struct sr_output *o, const struct sr_datafeed_packet *packet,
                GString **out)
 {
+       struct context *ctx;
        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, digits;
+       char number[32], suffix[32];
 
        *out = NULL;
        if (!o || !o->sdi)
                return SR_ERR_ARG;
+       ctx = o->priv;
 
        switch (packet->type) {
        case SR_DF_FRAME_BEGIN:
@@ -237,14 +257,46 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
                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);
+               if (analog2->encoding->is_digits_decimal) {
+                       if (ctx->digits == DIGITS_ALL)
+                               digits = analog2->encoding->digits;
+                       else
+                               digits = analog2->spec->spec_digits;
+               } else {
+                       /* TODO we don't know how to print by number of bits yet. */
+                       digits = 6;
+               }
+               sr_analog_unit_to_string(analog2, suffix, sizeof(suffix));
+               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);
+                               sr_analog_float_to_string(fdata[i * num_channels + c],
+                                               digits, number, sizeof(number));
+                               g_string_append(*out, number);
+                               g_string_append(*out, " ");
+                               g_string_append(*out, suffix);
+                               g_string_append(*out, "\n");
                        }
                }
                break;
@@ -259,20 +311,38 @@ 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;
 }
 
+static struct sr_option options[] = {
+       { "digits", "Digits", "Digits to show", NULL, NULL },
+       ALL_ZERO
+};
+
+static const struct sr_option *get_options(void)
+{
+       if (!options[0].def) {
+               options[0].def = g_variant_ref_sink(g_variant_new_string("all"));
+               options[0].values = g_slist_append(options[0].values,
+                               g_variant_ref_sink(g_variant_new_string("all")));
+               options[0].values = g_slist_append(options[0].values,
+                               g_variant_ref_sink(g_variant_new_string("spec")));
+       }
+
+       return options;
+}
+
 SR_PRIV struct sr_output_module output_analog = {
        .id = "analog",
        .name = "Analog",
        .desc = "Analog data and types",
-       .options = NULL,
+       .options = get_options,
        .init = init,
        .receive = receive,
        .cleanup = cleanup