X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok.h;h=7f18d6902d596c4917da3b016b48f2a01cb21381;hb=0d4405ce5e9373d2dcd90a9188b79d79eaafae5d;hp=2f7047a426119ef1a4a909792c8244e138e46cce;hpb=6caeef6ee5795232b78c8986619f8919e2b09c8c;p=libsigrok.git

diff --git a/libsigrok.h b/libsigrok.h
index 2f7047a4..7f18d690 100644
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -73,6 +73,7 @@ enum {
 	SR_ERR_NA         = -6, /**< Not applicable. */
 	SR_ERR_DEV_CLOSED = -7, /**< Device is closed, but needs to be open. */
 	SR_ERR_TIMEOUT    = -8, /**< A timeout occurred. */
+	SR_ERR_PROBE_GROUP= -9, /**< A probe group must be specified. */
 
 	/*
 	 * Note: When adding entries here, don't forget to also update the
@@ -142,6 +143,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 +217,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 +550,16 @@ struct sr_probe {
 	char *trigger;
 };
 
+/** Structure for groups of probes that have common properties. */
+struct sr_probe_group {
+	/** Name of the probe group. */
+	char *name;
+	/** List of sr_probe structs of the probes belonging to this group. */
+	GSList *probes;
+	/** Private data for driver use. */
+	void *priv;
+};
+
 struct sr_config {
 	int key;
 	GVariant *data;
@@ -581,6 +597,9 @@ enum {
 	/** The device can measure humidity. */
 	SR_CONF_HYGROMETER,
 
+	/** The device can measure energy consumption. */
+	SR_CONF_ENERGYMETER,
+
 	/*--- Driver scan options -------------------------------------------*/
 
 	/**
@@ -681,6 +700,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 +788,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 +827,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 +854,7 @@ struct sr_session {
 	/** List of struct datafeed_callback pointers. */
 	GSList *datafeed_callbacks;
 	GTimeVal starttime;
+	gboolean running;
 
 	unsigned int num_sources;