Add measured quantities for LCR meters.

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

diff --git a/include/libsigrok/libsigrok.h b/include/libsigrok/libsigrok.h
index 4f3510d8c6569f3b52e3aad2d37fd28c1cd6397b..924ec91219963280e9bd55373f0c497c5ba72572 100644 (file)
--- a/include/libsigrok/libsigrok.h
+++ b/include/libsigrok/libsigrok.h
@@ -201,6 +201,24 @@ 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,
 };
 
 /** Unit of measured quantity, sr_datafeed_analog.unit. */
@@ -264,6 +282,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. */
@@ -856,8 +878,6 @@ enum sr_configkey {
 struct sr_dev_inst {
        /** Device driver. */
        struct sr_dev_driver *driver;
-       /** Index of device in driver. */
-       int index;
        /** Device instance status. SR_ST_NOT_FOUND, etc. */
        int status;
        /** Device instance type. SR_INST_USB, etc. */
@@ -868,6 +888,10 @@ struct sr_dev_inst {
        char *model;
        /** Device version. */
        char *version;
+       /** Serial number. */
+       char *serial_num;
+       /** Connection string to uniquely identify devices. */
+       char *connection_id;
        /** List of channels. */
        GSList *channels;
        /** List of sr_channel_group structs */