X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=include%2Flibsigrok%2Flibsigrok.h;h=5d3d23c9963f102bf0aac1b7127a412bf784829a;hp=070107eeef294b6d5463bb9c94ae9572ca2f31c4;hb=1a7adeac29d6331b53a2c78fc9c70429b32da0bd;hpb=d643e6bc3942d7b7149a53b3091034d64eac0ad3

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 070107ee..5d3d23c9 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 */
@@ -235,6 +242,8 @@ enum sr_mq {
 	SR_MQ_HARMONIC_RATIO,
 	/** Energy. */
 	SR_MQ_ENERGY,
+	/** Electric charge. */
+	SR_MQ_ELECTRIC_CHARGE,
 
 	/* Update sr_key_info_mq[] (hwdriver.c) upon changes! */
 };
@@ -292,7 +301,7 @@ enum sr_unit {
 	SR_UNIT_VOLT_AMPERE,
 	/** Real power [W]. */
 	SR_UNIT_WATT,
-	/** Consumption [Wh]. */
+	/** Energy (consumption) in watt hour [Wh]. */
 	SR_UNIT_WATT_HOUR,
 	/** Wind speed in meters per second. */
 	SR_UNIT_METER_SECOND,
@@ -326,6 +335,12 @@ enum sr_unit {
 	SR_UNIT_TOLA,
 	/** Pieces (number of items). */
 	SR_UNIT_PIECE,
+	/** Energy in joule. */
+	SR_UNIT_JOULE,
+	/** Electric charge in coulomb. */
+	SR_UNIT_COULOMB,
+	/** Electric charge in ampere hour [Ah]. */
+	SR_UNIT_AMPERE_HOUR,
 
 	/*
 	 * Update unit_strings[] (analog.c) and fancyprint() (output/analog.c)
@@ -1033,6 +1048,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 -------------------------------------------------*/