X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fanalog.c;h=7437663924f86d1688fc190f134fe2fa9aee7e80;hb=71f1302b4b4b712149303d235876146e8d1d9af5;hp=684f8826bf2c3c38e43d050801eb9c49f119cf79;hpb=29a27196a13de2ffd9b671185e4b464b9db9b549;p=libsigrok.git

diff --git a/output/analog.c b/output/analog.c
index 684f8826..74376639 100644
--- a/output/analog.c
+++ b/output/analog.c
@@ -173,16 +173,32 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
 	case SR_UNIT_CONCENTRATION:
 		g_string_append_printf(out, "%f ppm", value * 1000000);
 		break;
+	case SR_UNIT_REVOLUTIONS_PER_MINUTE:
+		si_printf(value, out, "RPM");
+		break;
 	default:
 		si_printf(value, out, "");
 		break;
 	}
-	if ((mqflags & (SR_MQFLAG_AC | SR_MQFLAG_DC)) == (SR_MQFLAG_AC | SR_MQFLAG_DC))
-		g_string_append_printf(out, " AC+DC");
-	else if (mqflags & SR_MQFLAG_AC)
+
+	if (mqflags & SR_MQFLAG_AC)
 		g_string_append_printf(out, " AC");
-	else if (mqflags & SR_MQFLAG_DC)
+	if (mqflags & SR_MQFLAG_DC)
 		g_string_append_printf(out, " DC");
+	if (mqflags & SR_MQFLAG_RMS)
+		g_string_append_printf(out, " RMS");
+	if (mqflags & SR_MQFLAG_DIODE)
+		g_string_append_printf(out, " DIODE");
+	if (mqflags & SR_MQFLAG_HOLD)
+		g_string_append_printf(out, " HOLD");
+	if (mqflags & SR_MQFLAG_MAX)
+		g_string_append_printf(out, " MAX");
+	if (mqflags & SR_MQFLAG_MIN)
+		g_string_append_printf(out, " MIN");
+	if (mqflags & SR_MQFLAG_AUTORANGE)
+		g_string_append_printf(out, " AUTO");
+	if (mqflags & SR_MQFLAG_RELATIVE)
+		g_string_append_printf(out, " REL");
 	g_string_append_c(out, '\n');
 }