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 b4985a4eaf50a2c7b9384239c85539737c608ebc..f984bc1850e91112f90ee10f16ea43328d93d4b9 100644 (file)
--- a/src/output/analog.c
+++ b/src/output/analog.c
@@ -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,6 +219,12 @@ 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');
 }
 
@@ -222,7 +235,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
        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(const struct sr_output *o, const struct sr_datafeed_packet *p
                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;