X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok.h;h=985473c692728485aeb06e18be2992744aabac05;hb=78bcc55afa19dc2d8432afccf2fb78a0114db509;hp=b686c6e5463c8a37680fda29a0566756489888a1;hpb=5451816fd1676eab2942aba8cec6188451772760;p=libsigrok.git

diff --git a/libsigrok.h b/libsigrok.h
index b686c6e5..985473c6 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
@@ -216,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. */
@@ -545,6 +550,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;
@@ -582,6 +595,9 @@ enum {
 	/** The device can measure humidity. */
 	SR_CONF_HYGROMETER,
 
+	/** The device can measure energy consumption. */
+	SR_CONF_ENERGYMETER,
+
 	/*--- Driver scan options -------------------------------------------*/
 
 	/**
@@ -628,14 +644,6 @@ enum {
 	/** The device supports setting a pattern (pattern generator mode). */
 	SR_CONF_PATTERN_MODE,
 
-	/** The devices 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,
-
 	/** The device supports Run Length Encoding. */
 	SR_CONF_RLE,
 
@@ -693,6 +701,15 @@ enum {
 	/** 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. */
@@ -769,6 +786,8 @@ struct sr_dev_inst {
 	char *model;
 	char *version;
 	GSList *probes;
+	/* List of sr_probe_group structs */
+	GSList *probe_groups;
 	void *conn;
 	void *priv;
 };
@@ -806,11 +825,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);