X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok.h;h=17d7fc17d7a5249dff9d11c585ec95891bb596d9;hb=4a35548bbee613149fa4fbfa3dd9eaacb7511376;hp=a93a07ea3a4745218ce74c167117f254d3df75a8;hpb=db11d7d2d05c9e38978ae92920d96b61cf982d14;p=libsigrok.git

diff --git a/libsigrok.h b/libsigrok.h
index a93a07ea..17d7fc17 100644
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -216,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. */
@@ -582,6 +586,9 @@ enum {
 	/** The device can measure humidity. */
 	SR_CONF_HYGROMETER,
 
+	/** The device can measure energy consumption. */
+	SR_CONF_ENERGYMETER,
+
 	/*--- Driver scan options -------------------------------------------*/
 
 	/**
@@ -685,6 +692,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. */
@@ -822,6 +838,7 @@ struct sr_session {
 	/** List of struct datafeed_callback pointers. */
 	GSList *datafeed_callbacks;
 	GTimeVal starttime;
+	gboolean running;
 
 	unsigned int num_sources;