Add MQ/units for wind speed, pressure and humidity at 293 kelvin.

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index ade8277151c4e1711f4a66d7e184ea0474bad0d0..12f9b7754b69538ec24da3360bbf5dc157fd17e0 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -195,6 +195,10 @@ enum sr_mq {
        SR_MQ_RELATIVE_HUMIDITY,
        /** Time */
        SR_MQ_TIME,
+       /** Wind speed */
+       SR_MQ_WIND_SPEED,
+       /** Pressure */
+       SR_MQ_PRESSURE,
 };
 
 /** Unit of measured quantity, sr_datafeed_analog.unit. */
@@ -252,6 +256,12 @@ enum sr_unit {
        SR_UNIT_WATT,
        /** Consumption [Wh]. */
        SR_UNIT_WATT_HOUR,
+       /** Wind speed in meters per second. */
+       SR_UNIT_METER_SECOND,
+       /** Pressure in hectopascal */
+       SR_UNIT_HECTOPASCAL,
+       /** Relative humidity assuming air temperature of 293 kelvin (%rF). */
+       SR_UNIT_HUMIDITY_293K,
 };
 
 /** Values for sr_datafeed_analog.flags. */
@@ -738,8 +748,8 @@ enum sr_configkey {
        /** Coupling. */
        SR_CONF_COUPLING,
 
-       /** Trigger types.  */
-       SR_CONF_TRIGGER_TYPE,
+       /** Trigger matches.  */
+       SR_CONF_TRIGGER_MATCH,
 
        /** The device supports setting its sample interval, in ms. */
        SR_CONF_SAMPLE_INTERVAL,
@@ -979,7 +989,7 @@ struct sr_dev_driver {
                        const struct sr_dev_inst *sdi,
                        const struct sr_channel_group *cg);
        /** Channel status change.
-        *  @see sr_dev_channel_enable(), sr_dev_trigger_set(). */
+        *  @see sr_dev_channel_enable(). */
        int (*config_channel_set) (const struct sr_dev_inst *sdi,
                        struct sr_channel *ch, unsigned int changes);
        /** Apply configuration settings to the device hardware.