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

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 508ea3bd..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! */
 };
@@ -956,6 +958,8 @@ enum sr_configkey {
 	 * Channel regulation
 	 * get: "CV", "CC" or "UR", denoting constant voltage, constant current
 	 *      or unregulated.
+	 *      "CC-" denotes a power supply in current sink mode (e.g. HP 66xxB).
+	 *      "" is used when there is no regulation, e.g. the output is disabled.
 	 */
 	SR_CONF_REGULATION,
 
@@ -998,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 -------------------------------------------------*/