From: Uwe Hermann <redacted>
Date: Thu, 27 Aug 2015 18:44:23 +0000 (+0200)
Subject: Add a few scale related flags.
X-Git-Tag: libsigrok-0.4.0~386
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=28af4c714e2e3fd032e800f2c60dcda8953f5a3b;p=libsigrok.git

Add a few scale related flags.

 - SR_MQ_MASS: Mass, as measured by scales / balances.

 - SR_UNIT_*: Various units of mass.

 - SR_MQFLAG_UNSTABLE: A flag denoting that a value has not
   yet stabilized (settled). E.g. when placing an object on a scale
   it'll take a few moments until a stable reading is available.
   Measurement values marked with SR_MQFLAG_UNSTABLE denote that they
   are "unsettled", unstable values (not yet stabilized).
   The absence of SR_MQFLAG_UNSTABLE denotes that the value is stable.

 - SR_CONF_SCALE: A device class for weighing scales / balances.
---

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 0abf412f..140a8597 100644
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -231,6 +231,8 @@ enum sr_mq {
 	SR_MQ_POWER_FACTOR,
 	/** Apparent power */
 	SR_MQ_APPARENT_POWER,
+	/** Mass */
+	SR_MQ_MASS,
 };
 
 /** Unit of measured quantity, sr_datafeed_analog.unit. */
@@ -298,6 +300,28 @@ enum sr_unit {
 	SR_UNIT_DEGREE,
 	/** Henry (inductance). */
 	SR_UNIT_HENRY,
+	/** Mass in gram [g]. */
+	SR_UNIT_GRAM,
+	/** Mass in carat [ct]. */
+	SR_UNIT_CARAT,
+	/** Mass in ounce [oz]. */
+	SR_UNIT_OUNCE,
+	/** Mass in troy ounce [oz t]. */
+	SR_UNIT_TROY_OUNCE,
+	/** Mass in pound [lb]. */
+	SR_UNIT_POUND,
+	/** Mass in pennyweight [dwt]. */
+	SR_UNIT_PENNYWEIGHT,
+	/** Mass in grain [gr]. */
+	SR_UNIT_GRAIN,
+	/** Mass in tael (variants: Hong Kong, Singapore/Malaysia, Taiwan) */
+	SR_UNIT_TAEL,
+	/** Mass in momme. */
+	SR_UNIT_MOMME,
+	/** Mass in tola. */
+	SR_UNIT_TOLA,
+	/** Pieces (number of items). */
+	SR_UNIT_PIECE,
 };
 
 /** Values for sr_datafeed_analog.flags. */
@@ -350,6 +374,8 @@ enum sr_mqflag {
 	SR_MQFLAG_AVG = 0x40000,
 	/** Reference value shown. */
 	SR_MQFLAG_REFERENCE = 0x80000,
+	/** Unstable value (hasn't settled yet). */
+	SR_MQFLAG_UNSTABLE = 0x100000,
 };
 
 enum sr_trigger_matches {
@@ -640,6 +666,9 @@ enum sr_configkey {
 	/** The device can act as an electronic load. */
 	SR_CONF_ELECTRONIC_LOAD,
 
+	/** The device can act as a scale. */
+	SR_CONF_SCALE,
+
 	/*--- Driver scan options -------------------------------------------*/
 
 	/**