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

diff --git a/libsigrok.h b/libsigrok.h
index da6a1011..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
@@ -141,6 +142,8 @@ enum {
 	SR_T_RATIONAL_PERIOD,
 	SR_T_RATIONAL_VOLT,
 	SR_T_KEYVALUE,
+	SR_T_UINT64_RANGE,
+	SR_T_DOUBLE_RANGE,
 };
 
 /** Value for sr_datafeed_packet.type. */
@@ -214,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. */
@@ -543,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;
@@ -580,6 +595,9 @@ enum {
 	/** The device can measure humidity. */
 	SR_CONF_HYGROMETER,
 
+	/** The device can measure energy consumption. */
+	SR_CONF_ENERGYMETER,
+
 	/*--- Driver scan options -------------------------------------------*/
 
 	/**
@@ -665,6 +683,33 @@ enum {
 	/** Number of vertical divisions, as related to SR_CONF_VDIV.  */
 	SR_CONF_NUM_VDIV,
 
+	/** Sound pressure level frequency weighting.  */
+	SR_CONF_SPL_WEIGHT_FREQ,
+
+	/** Sound pressure level time weighting.  */
+	SR_CONF_SPL_WEIGHT_TIME,
+
+	/** Sound pressure level measurement range.  */
+	SR_CONF_SPL_MEASUREMENT_RANGE,
+
+	/** Max hold mode. */
+	SR_CONF_HOLD_MAX,
+
+	/** 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. */
@@ -685,6 +730,21 @@ enum {
 	/** The device supports setting the number of probes. */
 	SR_CONF_CAPTURE_NUM_PROBES,
 
+	/** Power off the device. */
+	SR_CONF_POWER_OFF,
+
+	/** Data source for acquisition. If not present, acquisition from
+	 * the device is always "live", i.e. acquisition starts when the
+	 * frontend asks and the results are sent out as soon as possible.
+	 *
+	 * If present, it indicates that either the device has no live
+	 * acquisition capability (for example a pure data logger), or
+	 * there is a choice. sr_config_list() returns those choices.
+	 *
+	 * In any case if a device has live acquisition capabilities, it
+	 * is always the default. */
+	SR_CONF_DATA_SOURCE,
+
 	/*--- Acquisition modes ---------------------------------------------*/
 
 	/**
@@ -726,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;
 };
@@ -763,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);
@@ -787,6 +852,7 @@ struct sr_session {
 	/** List of struct datafeed_callback pointers. */
 	GSList *datafeed_callbacks;
 	GTimeVal starttime;
+	gboolean running;
 
 	unsigned int num_sources;