Track sdis created by sr_session_load(), and free in sr_session_destroy().

[libsigrok.git] / include / libsigrok / libsigrok.h

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 61e0caa897ef8e27076a5ed7831911cf6b6d8cda..499ee6c4fd985f667f7a04c8e66b6ef885249a42 100644 (file)
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -201,6 +201,26 @@ enum sr_mq {
        SR_MQ_WIND_SPEED,
        /** Pressure */
        SR_MQ_PRESSURE,
+       /** Parallel inductance (LCR meter model). */
+       SR_MQ_PARALLEL_INDUCTANCE,
+       /** Parallel capacitance (LCR meter model). */
+       SR_MQ_PARALLEL_CAPACITANCE,
+       /** Parallel resistance (LCR meter model). */
+       SR_MQ_PARALLEL_RESISTANCE,
+       /** Serial inductance (LCR meter model). */
+       SR_MQ_SERIAL_INDUCTANCE,
+       /** Serial capacitance (LCR meter model). */
+       SR_MQ_SERIAL_CAPACITANCE,
+       /** Serial resistance (LCR meter model). */
+       SR_MQ_SERIAL_RESISTANCE,
+       /** Dissipation factor. */
+       SR_MQ_DISSIPATION_FACTOR,
+       /** Quality factor. */
+       SR_MQ_QUALITY_FACTOR,
+       /** Phase angle. */
+       SR_MQ_PHASE_ANGLE,
+       /** Difference from reference value. */
+       SR_MQ_DIFFERENCE,
 };
 
 /** Unit of measured quantity, sr_datafeed_analog.unit. */
@@ -264,6 +284,10 @@ enum sr_unit {
        SR_UNIT_HECTOPASCAL,
        /** Relative humidity assuming air temperature of 293 kelvin (%rF). */
        SR_UNIT_HUMIDITY_293K,
+       /** Plane angle in 1/360th of a full circle. */
+       SR_UNIT_DEGREE,
+       /** Henry (inductance). */
+       SR_UNIT_HENRY,
 };
 
 /** Values for sr_datafeed_analog.flags. */
@@ -314,6 +338,12 @@ enum sr_mqflag {
        SR_MQFLAG_DURATION = 0x20000,
        /** Device is in "avg" mode, averaging upon each new value. */
        SR_MQFLAG_AVG = 0x40000,
+       /** Reference value shown. */
+       SR_MQFLAG_REFERENCE = 0x80000,
+       /** Device selects the measured quantity automatically. */
+       SR_MQFLAG_AUTOMQ = 0x100000,
+       /** Device selects the measurement model automatically. */
+       SR_MQFLAG_AUTOMODEL = 0x200000,
 };
 
 enum sr_trigger_matches {
@@ -544,6 +574,9 @@ enum sr_configkey {
        /** Programmable power supply. */
        SR_CONF_POWER_SUPPLY,
 
+       /** LCR meter. */
+       SR_CONF_LCRMETER,
+
        /*--- Driver scan options -------------------------------------------*/
 
        /**
@@ -671,32 +704,32 @@ enum sr_configkey {
        /**
         * Output voltage.
         * @arg type: double
-        * @arg get: get output voltage
+        * @arg get: get measured output voltage
         */
        SR_CONF_OUTPUT_VOLTAGE,
 
        /**
-        * Maximum output voltage.
+        * Maximum output voltage target.
         * @arg type: double
-        * @arg get: get maximum output voltage limit
-        * @arg set: change output voltage limit
+        * @arg get: get output voltage target
+        * @arg set: change output voltage target
         */
-       SR_CONF_OUTPUT_VOLTAGE_MAX,
+       SR_CONF_OUTPUT_VOLTAGE_TARGET,
 
        /**
         * Output current.
         * @arg type: double
-        * @arg get: get output current
+        * @arg get: get measured output current
         */
        SR_CONF_OUTPUT_CURRENT,
 
        /**
-        * Maximum output current.
+        * Output current limit.
         * @arg type: double
-        * @arg get: get maximum output voltage limit
-        * @arg set: change output voltage limit
+        * @arg get: get output current limit
+        * @arg set: change output current limit
         */
-       SR_CONF_OUTPUT_CURRENT_MAX,
+       SR_CONF_OUTPUT_CURRENT_LIMIT,
 
        /**
         * Enabling/disabling output.
@@ -779,6 +812,9 @@ enum sr_configkey {
        /** Over-temperature protection (OTP) */
        SR_CONF_OVER_TEMPERATURE_PROTECTION,
 
+       /** Output frequency in Hz. */
+       SR_CONF_OUTPUT_FREQUENCY,
+
        /*--- Special stuff -------------------------------------------------*/
 
        /** Scan options supported by the driver. */