X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fanalog.c;h=4f5acd668375dce7dcd04a5f911db9aff594ece4;hb=ce48b174da534120e7b725cd664743a6e9a75956;hp=f81e683c7665a7acd3481a73994774a2aaaf98e3;hpb=a755b0e122105d934c4e7b97435420eda6df6e8e;p=libsigrok.git

diff --git a/src/output/analog.c b/src/output/analog.c
index f81e683c..4f5acd66 100644
--- a/src/output/analog.c
+++ b/src/output/analog.c
@@ -46,7 +46,7 @@ static int init(struct sr_output *o, GHashTable *options)
 		sr_err("Output module context malloc failed.");
 		return SR_ERR_MALLOC;
 	}
-	o->internal = ctx;
+	o->priv = ctx;
 
 	/* Get the number of channels and their names. */
 	ctx->channellist = g_ptr_array_new();
@@ -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,8 @@ 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");
 	g_string_append_c(out, '\n');
 }
 
@@ -222,7 +231,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 	struct sr_channel *ch;
 	GSList *l;
 	const float *fdata;
-	int i, p;
+	int num_channels, i, c;
 
 	*out = NULL;
 	if (!o || !o->sdi)
@@ -239,12 +248,13 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 		analog = packet->payload;
 		fdata = (const float *)analog->data;
 		*out = g_string_sized_new(512);
+		num_channels = g_slist_length(analog->channels);
 		for (i = 0; i < analog->num_samples; i++) {
-			for (l = analog->channels, p = 0; l; l = l->next, p++) {
+			for (l = analog->channels, c = 0; l; l = l->next, c++) {
 				ch = l->data;
 				g_string_append_printf(*out, "%s: ", ch->name);
 				fancyprint(analog->unit, analog->mqflags,
-						fdata[i + p], *out);
+						fdata[i * num_channels + c], *out);
 			}
 		}
 		break;
@@ -259,11 +269,11 @@ static int cleanup(struct sr_output *o)
 
 	if (!o || !o->sdi)
 		return SR_ERR_ARG;
-	ctx = o->internal;
+	ctx = o->priv;
 
 	g_ptr_array_free(ctx->channellist, 1);
 	g_free(ctx);
-	o->internal = NULL;
+	o->priv = NULL;
 
 	return SR_OK;
 }