Initial Comma-separated values (CSV) input support.

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index b8f4f757019d45c6be16c957c2e0f83e2e0e4a2d..17d7fc17d7a5249dff9d11c585ec95891bb596d9 100644 (file)
--- 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 -------------------------------------------*/
 
        /**
@@ -628,9 +635,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 Run Length Encoding. */
        SR_CONF_RLE,
 
@@ -688,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. */
@@ -825,6 +838,7 @@ struct sr_session {
        /** List of struct datafeed_callback pointers. */
        GSList *datafeed_callbacks;
        GTimeVal starttime;
+       gboolean running;
 
        unsigned int num_sources;