X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=libsigrok.h;h=17d7fc17d7a5249dff9d11c585ec95891bb596d9;hb=122d33d47d17fd56c6306190b7066d8819b43145;hp=7019fdb21e7685292cc3136a7db7f3c5c165e837;hpb=32de50b7f3f0155589d90b273cac6b0c3dcfeec6;p=libsigrok.git

diff --git a/libsigrok.h b/libsigrok.h
index 7019fdb2..17d7fc17 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. */
@@ -581,6 +586,9 @@ enum {
 	/** The device can measure humidity. */
 	SR_CONF_HYGROMETER,
 
+	/** The device can measure energy consumption. */
+	SR_CONF_ENERGYMETER,
+
 	/*--- Driver scan options -------------------------------------------*/
 
 	/**
@@ -681,6 +689,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. */
@@ -704,6 +724,18 @@ enum {
 	/** 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 ---------------------------------------------*/
 
 	/**
@@ -806,6 +838,7 @@ struct sr_session {
 	/** List of struct datafeed_callback pointers. */
 	GSList *datafeed_callbacks;
 	GTimeVal starttime;
+	gboolean running;
 
 	unsigned int num_sources;