X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=include%2Flibsigrok%2Flibsigrok.h;h=2779490d9db0134d322e29f3eabfe5d63daf889c;hb=9b093606545ec3963a03a3cfac61954c62e93e10;hp=63dc483be20d528e19c9cc86037469e23c73c128;hpb=97a000748a1a4ca7370121af0c84d0e2281d527a;p=libsigrok.git

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 63dc483b..2779490d 100644
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -233,6 +233,8 @@ enum sr_mq {
 	SR_MQ_MASS,
 	/** Harmonic ratio */
 	SR_MQ_HARMONIC_RATIO,
+	/** Energy. */
+	SR_MQ_ENERGY,
 
 	/* Update sr_key_info_mq[] (hwdriver.c) upon changes! */
 };
@@ -767,21 +769,9 @@ enum sr_configkey {
 	/** The device supports run-length encoding (RLE). */
 	SR_CONF_RLE,
 
-	/** Trigger source. */
-	SR_CONF_TRIGGER_SOURCE,
-
 	/** The device supports setting trigger slope. */
 	SR_CONF_TRIGGER_SLOPE,
 
-	/** The device supports setting a pattern for the logic trigger. */
-	SR_CONF_TRIGGER_PATTERN,
-
-	/** High resolution mode. */
-	SR_CONF_HIGH_RESOLUTION,
-
-	/** Peak detection. */
-	SR_CONF_PEAK_DETECTION,
-
 	/** The device supports averaging. */
 	SR_CONF_AVERAGING,
 
@@ -791,6 +781,9 @@ enum sr_configkey {
 	 */
 	SR_CONF_AVG_SAMPLES,
 
+	/** Trigger source. */
+	SR_CONF_TRIGGER_SOURCE,
+
 	/** Horizontal trigger position. */
 	SR_CONF_HORIZ_TRIGGERPOS,
 
@@ -839,12 +832,6 @@ enum sr_configkey {
 	/** Logic low-high threshold range. */
 	SR_CONF_VOLTAGE_THRESHOLD,
 
-	/** Logic threshold: predefined levels (TTL, ECL, CMOS, etc). */
-	SR_CONF_LOGIC_THRESHOLD,
-
-	/** Logic threshold: custom numerical value. */
-	SR_CONF_LOGIC_THRESHOLD_CUSTOM,
-
 	/** The device supports using an external clock. */
 	SR_CONF_EXTERNAL_CLOCK,
 
@@ -1015,6 +1002,27 @@ enum sr_configkey {
 	/** Offset of a source without strictly-defined MQ. */
 	SR_CONF_OFFSET,
 
+	/** The device supports setting a pattern for the logic trigger. */
+	SR_CONF_TRIGGER_PATTERN,
+
+	/** High resolution mode. */
+	SR_CONF_HIGH_RESOLUTION,
+
+	/** Peak detection. */
+	SR_CONF_PEAK_DETECTION,
+
+	/** Logic threshold: predefined levels (TTL, ECL, CMOS, etc). */
+	SR_CONF_LOGIC_THRESHOLD,
+
+	/** Logic threshold: custom numerical value. */
+	SR_CONF_LOGIC_THRESHOLD_CUSTOM,
+
+	/** The measurement range of a DMM or the output range of a power supply. */
+	SR_CONF_RANGE,
+
+	/** The number of digits (e.g. for a DMM). */
+	SR_CONF_DIGITS,
+
 	/* Update sr_key_info_config[] (hwdriver.c) upon changes! */
 
 	/*--- Special stuff -------------------------------------------------*/