From: Bert Vermeulen <redacted>
Date: Tue, 25 Sep 2012 17:34:53 +0000 (+0200)
Subject: sr: add support for conductance measurements in Siemens
X-Git-Tag: dsupstream~680
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=96b3b3d56834f7c07a4760cfa3444b516c819de3;p=libsigrok.git

sr: add support for conductance measurements in Siemens
---

diff --git a/libsigrok.h b/libsigrok.h
index 5aacf2a6..595f1917 100644
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -147,6 +147,7 @@ enum {
 	SR_MQ_DUTY_CYCLE,
 	SR_MQ_CONTINUITY,
 	SR_MQ_PULSE_WIDTH,
+	SR_MQ_CONDUCTANCE,
 };
 
 /* sr_datafeed_analog.unit values */
@@ -162,6 +163,7 @@ enum {
 	SR_UNIT_PERCENTAGE,
 	SR_UNIT_BOOLEAN,
 	SR_UNIT_SECOND,
+	SR_UNIT_SIEMENS,
 };
 
 /** sr_datafeed_analog.flags values */
diff --git a/output/analog.c b/output/analog.c
index 7c1b1007..d87e22f1 100644
--- a/output/analog.c
+++ b/output/analog.c
@@ -128,6 +128,9 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
 		case SR_UNIT_SECOND:
 			si_printf(value, out, "s");
 			break;
+		case SR_UNIT_SIEMENS:
+			si_printf(value, out, "S");
+			break;
 	}
 	if (mqflags & SR_MQFLAG_AC)
 		g_string_append_printf(out, " AC");