X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libsigrok.h;h=2232071cf6a3e60af43383a21a35308cf58b6a3e;hb=f48e0249b45592811598c493b08a1fbf5219b659;hp=2f7047a426119ef1a4a909792c8244e138e46cce;hpb=6caeef6ee5795232b78c8986619f8919e2b09c8c;p=libsigrok.git diff --git a/libsigrok.h b/libsigrok.h index 2f7047a4..2232071c 100644 --- a/libsigrok.h +++ b/libsigrok.h @@ -142,6 +142,7 @@ enum { SR_T_RATIONAL_VOLT, SR_T_KEYVALUE, SR_T_UINT64_RANGE, + SR_T_DOUBLE_RANGE, }; /** Value for sr_datafeed_packet.type. */ @@ -215,6 +216,10 @@ enum { * represented as the fraction of number of particles of the substance. */ SR_UNIT_CONCENTRATION, + SR_UNIT_REVOLUTIONS_PER_MINUTE, + SR_UNIT_VOLT_AMPERE, + SR_UNIT_WATT, + SR_UNIT_WATT_HOUR, }; /** Values for sr_datafeed_analog.flags. */ @@ -544,6 +549,14 @@ struct sr_probe { char *trigger; }; +struct sr_probe_group { + char *name; + /* List of sr_probe structs. */ + GSList *probes; + /* Private data for driver use. */ + void *priv; +}; + struct sr_config { int key; GVariant *data; @@ -581,6 +594,9 @@ enum { /** The device can measure humidity. */ SR_CONF_HYGROMETER, + /** The device can measure energy consumption. */ + SR_CONF_ENERGYMETER, + /*--- Driver scan options -------------------------------------------*/ /** @@ -681,6 +697,18 @@ enum { /** Min hold mode. */ SR_CONF_HOLD_MIN, + /** Logic low-high threshold range. */ + SR_CONF_VOLTAGE_THRESHOLD, + + /** The device supports using a external clock. */ + SR_CONF_EXTERNAL_CLOCK, + + /** + * The device supports swapping channels. Typical this is between + * buffered and unbuffered channels. + */ + SR_CONF_SWAP, + /*--- Special stuff -------------------------------------------------*/ /** Scan options supported by the driver. */ @@ -757,6 +785,8 @@ struct sr_dev_inst { char *model; char *version; GSList *probes; + /* List of sr_probe_group structs */ + GSList *probe_groups; void *conn; void *priv; }; @@ -794,11 +824,14 @@ struct sr_dev_driver { GSList *(*dev_list) (void); int (*dev_clear) (void); int (*config_get) (int id, GVariant **data, - const struct sr_dev_inst *sdi); + const struct sr_dev_inst *sdi, + const struct sr_probe_group *probe_group); int (*config_set) (int id, GVariant *data, - const struct sr_dev_inst *sdi); + const struct sr_dev_inst *sdi, + const struct sr_probe_group *probe_group); int (*config_list) (int info_id, GVariant **data, - const struct sr_dev_inst *sdi); + const struct sr_dev_inst *sdi, + const struct sr_probe_group *probe_group); /* Device-specific */ int (*dev_open) (struct sr_dev_inst *sdi); @@ -818,6 +851,7 @@ struct sr_session { /** List of struct datafeed_callback pointers. */ GSList *datafeed_callbacks; GTimeVal starttime; + gboolean running; unsigned int num_sources;