output: also print meta strings in analog output module

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

diff --git a/src/output/analog.c b/src/output/analog.c
index 94175369e1a15c43e4d0a48f7a3a6df9b4fb6b4e..5c624e050033729273b0972fb4c6c580cecd80c8 100644 (file)
--- a/src/output/analog.c
+++ b/src/output/analog.c
@@ -27,6 +27,8 @@
 
 #define LOG_PREFIX "output/analog"
 
+#define BIN_TO_DEC_DIGITS (log(2) / log(10))
+
 struct context {
        int num_enabled_channels;
        GPtrArray *channellist;
@@ -116,6 +118,9 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
                                g_string_append_printf(*out, "%"
                                        G_GUINT64_FORMAT,
                                        g_variant_get_uint64(src->data));
+                       } else if (srci->datatype == SR_T_STRING) {
+                               g_string_append_printf(*out, "%s",
+                                       g_variant_get_string(src->data, NULL));
                        }
                        g_string_append(*out, "\n");
                }
@@ -130,15 +135,12 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
                if ((ret = sr_analog_to_float(analog, fdata)) != SR_OK)
                        return ret;
                *out = g_string_sized_new(512);
-               if (analog->encoding->is_digits_decimal) {
-                       if (ctx->digits == DIGITS_ALL)
-                               digits = analog->encoding->digits;
-                       else
-                               digits = analog->spec->spec_digits;
-               } else {
-                       /* TODO we don't know how to print by number of bits yet. */
-                       digits = 6;
-               }
+               if (ctx->digits == DIGITS_ALL)
+                       digits = analog->encoding->digits;
+               else
+                       digits = analog->spec->spec_digits;
+               if (!analog->encoding->is_digits_decimal)
+                       digits = copysign(ceil(abs(digits) * BIN_TO_DEC_DIGITS), digits);
                gboolean si_friendly = sr_analog_si_prefix_friendly(analog->meaning->unit);
                sr_analog_unit_to_string(analog, &suffix);
                for (i = 0; i < analog->num_samples; i++) {