X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok.h;h=17d7fc17d7a5249dff9d11c585ec95891bb596d9;hb=4a35548bbee613149fa4fbfa3dd9eaacb7511376;hp=b686c6e5463c8a37680fda29a0566756489888a1;hpb=5451816fd1676eab2942aba8cec6188451772760;p=libsigrok.git

diff --git a/libsigrok.h b/libsigrok.h
index b686c6e5..17d7fc17 100644
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -216,6 +216,10 @@ enum {
 	 * represented as the fraction of number of particles of the substance.
 	 */
 	SR_UNIT_CONCENTRATION,
+	SR_UNIT_REVOLUTIONS_PER_MINUTE,
+	SR_UNIT_VOLT_AMPERE,
+	SR_UNIT_WATT,
+	SR_UNIT_WATT_HOUR,
 };
 
 /** Values for sr_datafeed_analog.flags. */
@@ -582,6 +586,9 @@ enum {
 	/** The device can measure humidity. */
 	SR_CONF_HYGROMETER,
 
+	/** The device can measure energy consumption. */
+	SR_CONF_ENERGYMETER,
+
 	/*--- Driver scan options -------------------------------------------*/
 
 	/**
@@ -628,14 +635,6 @@ enum {
 	/** The device supports setting a pattern (pattern generator mode). */
 	SR_CONF_PATTERN_MODE,
 
-	/** The devices supports using a external clock. */
-	SR_CONF_EXTERNAL_CLOCK,
-
-	/** The device supports swapping channels. Typical this is between
-	 *  buffered and unbuffered channels.
-	 */
-	SR_CONF_SWAP,
-
 	/** The device supports Run Length Encoding. */
 	SR_CONF_RLE,
 
@@ -693,6 +692,15 @@ enum {
 	/** Logic low-high threshold range. */
 	SR_CONF_VOLTAGE_THRESHOLD,
 
+	/** The device supports using a external clock. */
+	SR_CONF_EXTERNAL_CLOCK,
+
+	/**
+	 * The device supports swapping channels. Typical this is between
+	 * buffered and unbuffered channels.
+	 */
+	SR_CONF_SWAP,
+
 	/*--- Special stuff -------------------------------------------------*/
 
 	/** Scan options supported by the driver. */