X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fanalog.c;h=05194daba4b9a2d868bf26537cff198eda13d524;hb=d11d606626a2ce9359ed2b5395fe4b998604da92;hp=3049ba738a78eb3325b3c0c33b2578b9e49847e8;hpb=6aff0d16df34c60dada92486db0554ad32e08422;p=libsigrok.git

diff --git a/output/analog.c b/output/analog.c
index 3049ba73..05194dab 100644
--- a/output/analog.c
+++ b/output/analog.c
@@ -63,21 +63,27 @@ static int init(struct sr_output *o)
 
 static void si_printf(float value, GString *out, char *unitstr)
 {
+	float v;
 
-	if (value > 1000000000L)
-		g_string_append_printf(out, "%f G%s", value / 1000000000L, unitstr);
-	else if (value > 1000000)
-		g_string_append_printf(out, "%f M%s", value / 1000000, unitstr);
-	else if (value > 1000)
-		g_string_append_printf(out, "%f k%s", value / 1000, unitstr);
-	else if (value < 0.000000000001)
-		g_string_append_printf(out, "%f p%s", value * 1000000000000, unitstr);
-	else if (value < 0.000000001)
-		g_string_append_printf(out, "%f n%s", value * 1000000000, unitstr);
-	else if (value < 0.000001)
-		g_string_append_printf(out, "%f u%s", value * 1000000, unitstr);
-	else if (value < 0.001)
-		g_string_append_printf(out, "%f m%s", value * 1000, unitstr);
+	if (signbit(value))
+		v = -(value);
+	else
+		v = value;
+
+	if (v < 1e-12 || v > 1e+12)
+		g_string_append_printf(out, "%f %s", value, unitstr);
+	else if (v > 1e+9)
+		g_string_append_printf(out, "%f G%s", value / 1e+9, unitstr);
+	else if (v > 1e+6)
+		g_string_append_printf(out, "%f M%s", value / 1e+6, unitstr);
+	else if (v > 1e+3)
+		g_string_append_printf(out, "%f k%s", value / 1e+3, unitstr);
+	else if (v < 1e-9)
+		g_string_append_printf(out, "%f n%s", value * 1e+9, unitstr);
+	else if (v < 1e-6)
+		g_string_append_printf(out, "%f u%s", value * 1e+6, unitstr);
+	else if (v < 1e-3)
+		g_string_append_printf(out, "%f m%s", value * 1e+3, unitstr);
 	else
 		g_string_append_printf(out, "%f %s", value, unitstr);
 
@@ -131,6 +137,12 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
 		case SR_UNIT_SIEMENS:
 			si_printf(value, out, "S");
 			break;
+		case SR_UNIT_DECIBEL_MW:
+			si_printf(value, out, "dBu");
+			break;
+		case SR_UNIT_DECIBEL_VOLT:
+			si_printf(value, out, "dBV");
+			break;
 	}
 	if ((mqflags & (SR_MQFLAG_AC | SR_MQFLAG_DC)) == (SR_MQFLAG_AC | SR_MQFLAG_DC))
 		g_string_append_printf(out, " AC+DC");
@@ -150,6 +162,7 @@ static GString *receive(struct sr_output *o, const struct sr_dev_inst *sdi,
 	float *fdata;
 	int i, j;
 
+	(void)sdi;
 	if (!o || !o->sdi)
 		return NULL;
 	ctx = o->internal;