From: Janne Huttunen <redacted>
Date: Sat, 11 Oct 2014 12:47:33 +0000 (+0300)
Subject: Add pretty-printer for new units and flags.
X-Git-Tag: libsigrok-0.4.0~870
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=02c7c482a60f3209adb7c44f4ff52ac087a0aeb0;p=libsigrok.git

Add pretty-printer for new units and flags.

Add support for printing henries and degrees as well as the new
reference and auto flags.
---

diff --git a/src/output/analog.c b/src/output/analog.c
index c76392ca..f984bc18 100644
--- 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');
 }