X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=include%2Flibsigrok%2Flibsigrok.h;h=81a831b3b1814d2bc1b46504ce009b6395fc3dd6;hb=9de389b1979ad69e0a857a97d0e7a144d86d0f61;hp=c16278c407efb91a0eda0c90b23b90d1a503e3bb;hpb=fe8c5aef1ffdadd45b31eecc84201ed3ed5402b7;p=libsigrok.git

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index c16278c4..81a831b3 100644
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -80,6 +80,13 @@ enum sr_error_code {
 	/* Update sr_strerror()/sr_strerror_name() (error.c) upon changes! */
 };
 
+/** Ternary return type for DMM/LCR/etc packet parser validity checks. */
+enum sr_valid_code {
+	SR_PACKET_INVALID = -1,	/**< Certainly invalid. */
+	SR_PACKET_VALID = 0,	/**< Certainly valid. */
+	SR_PACKET_NEED_RX = +1,	/**< Need more RX data. */
+};
+
 #define SR_MAX_CHANNELNAME_LEN 32
 
 /* Handy little macros */
@@ -328,7 +335,7 @@ enum sr_unit {
 	SR_UNIT_TOLA,
 	/** Pieces (number of items). */
 	SR_UNIT_PIECE,
-	/** A relative unit of (power) measurement [dB]. */
+	/** Energy in joule. */
 	SR_UNIT_JOULE,
 	/** Electric charge in coulomb. */
 	SR_UNIT_COULOMB,
@@ -716,6 +723,12 @@ enum sr_configkey {
 	/** The device can measure power. */
 	SR_CONF_POWERMETER,
 
+	/**
+	 * The device can switch between multiple sources, e.g. a relay actuator
+	 * or multiplexer.
+	 */
+	SR_CONF_MULTIPLEXER,
+
 	/* Update sr_key_info_config[] (hwdriver.c) upon changes! */
 
 	/*--- Driver scan options -------------------------------------------*/
@@ -1041,6 +1054,35 @@ enum sr_configkey {
 	/** The number of digits (e.g. for a DMM). */
 	SR_CONF_DIGITS,
 
+	/** Phase of a source signal. */
+	SR_CONF_PHASE,
+
+	/** Duty cycle of a source signal. */
+	SR_CONF_DUTY_CYCLE,
+
+	/**
+	 * Current power.
+	 * @arg type: double
+	 * @arg get: get measured power
+	 */
+	SR_CONF_POWER,
+
+	/**
+	 * Power target.
+	 * @arg type: double
+	 * @arg get: get power target
+	 * @arg set: change power target
+	 */
+	SR_CONF_POWER_TARGET,
+
+	/**
+	 * Resistance target.
+	 * @arg type: double
+	 * @arg get: get resistance target
+	 * @arg set: change resistance target
+	 */
+	SR_CONF_RESISTANCE_TARGET,
+
 	/* Update sr_key_info_config[] (hwdriver.c) upon changes! */
 
 	/*--- Special stuff -------------------------------------------------*/