X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fanalog.c;h=cd1764b842fd7c23d0e8fd2a91e3aaf762a3160c;hb=0f8bee7162f41095ca1975fec9a87975ce5a554a;hp=99daf3ac8a56f0ab1f03f57ce63c60664d733d91;hpb=d1d3d2e0c4f74625f6f8379a3128412c600ad98d;p=libsigrok.git

diff --git a/src/output/analog.c b/src/output/analog.c
index 99daf3ac..cd1764b8 100644
--- a/src/output/analog.c
+++ b/src/output/analog.c
@@ -79,7 +79,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 	GSList *l;
 	float *fdata;
 	unsigned int i;
-	int num_channels, c, ret, digits;
+	int num_channels, c, ret, digits, actual_digits;
 	char *number, *suffix;
 
 	*out = NULL;
@@ -113,16 +113,22 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 			/* TODO we don't know how to print by number of bits yet. */
 			digits = 6;
 		}
+		gboolean si_friendly = sr_analog_si_prefix_friendly(analog->meaning->unit);
 		sr_analog_unit_to_string(analog, &suffix);
 		for (i = 0; i < analog->num_samples; i++) {
 			for (l = analog->meaning->channels, c = 0; l; l = l->next, c++) {
+				float value = fdata[i * num_channels + c];
+				const char *prefix = "";
+				actual_digits = digits;
+				if (si_friendly)
+					prefix = sr_analog_si_prefix(&value, &actual_digits);
 				ch = l->data;
 				g_string_append_printf(*out, "%s: ", ch->name);
-				number = g_strdup_printf("%.*f", digits,
-						fdata[i * num_channels + c]);
+				number = g_strdup_printf("%.*f", MAX(actual_digits, 0), value);
 				g_string_append(*out, number);
 				g_free(number);
 				g_string_append(*out, " ");
+				g_string_append(*out, prefix);
 				g_string_append(*out, suffix);
 				g_string_append(*out, "\n");
 			}