]> sigrok.org Git - libsigrok.git/commitdiff
Add pretty-printer for new units and flags.
authorJanne Huttunen <redacted>
Sat, 11 Oct 2014 12:47:33 +0000 (15:47 +0300)
committerUwe Hermann <redacted>
Sun, 12 Oct 2014 21:19:05 +0000 (23:19 +0200)
Add support for printing henries and degrees as well as the new
reference and auto flags.

src/output/analog.c

index c76392caeffbf488ad373e84d1eb92bd0385f41e..f984bc1850e91112f90ee10f16ea43328d93d4b9 100644 (file)
@@ -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');
 }