Add support for the UNI-T UT61C multimeter.

[libsigrok.git] / libsigrok.h

diff --git a/libsigrok.h b/libsigrok.h
index 6e81c6f69851dbbb7e33aca7d35198d80fc670bf..a301132090965f2a9f89a08318440566118cdfab 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIBSIGROK_SIGROK_H
-#define LIBSIGROK_SIGROK_H
+#ifndef LIBSIGROK_LIBSIGROK_H
+#define LIBSIGROK_LIBSIGROK_H
 
 #include <stdio.h>
 #include <sys/time.h>
@@ -145,6 +145,7 @@ enum {
        SR_T_KEYVALUE,
        SR_T_UINT64_RANGE,
        SR_T_DOUBLE_RANGE,
+       SR_T_INT32,
 };
 
 /** Value for sr_datafeed_packet.type. */
@@ -299,9 +300,18 @@ enum {
        SR_MQFLAG_SPL_PCT_OVER_ALARM = 0x10000,
        /** Time is duration (as opposed to epoch, ...). */
        SR_MQFLAG_DURATION = 0x20000,
+       /** Device is in "avg" mode, averaging upon each new value. */
+       SR_MQFLAG_AVG = 0x40000,
 };
 
-/** sigrok context (opaque). @see sr_init(), sr_exit(). */
+/**
+ * @struct sr_context
+ * Opaque structure representing a libsigrok context.
+ *
+ * None of the fields of this structure are meant to be accessed directly.
+ *
+ * @see sr_init(), sr_exit().
+ */
 struct sr_context;
 
 /** Packet in a sigrok data feed. */
@@ -670,6 +680,9 @@ enum {
        /** The device can measure energy consumption. */
        SR_CONF_ENERGYMETER,
 
+       /** The device can demodulate signals. */
+       SR_CONF_DEMODULATOR,
+
        /*--- Driver scan options -------------------------------------------*/
 
        /**
@@ -773,7 +786,7 @@ enum {
        /** Logic low-high threshold range. */
        SR_CONF_VOLTAGE_THRESHOLD,
 
-       /** The device supports using a external clock. */
+       /** The device supports using an external clock. */
        SR_CONF_EXTERNAL_CLOCK,
 
        /**
@@ -782,6 +795,18 @@ enum {
         */
        SR_CONF_SWAP,
 
+       /** Center frequency.
+        * The input signal is downmixed by this frequency before the ADC
+        * anti-aliasing filter.
+        */
+       SR_CONF_CENTER_FREQUENCY,
+
+       /** The device supports setting the number of logic probes. */
+       SR_CONF_NUM_LOGIC_PROBES,
+
+       /** The device supports setting the number of analog probes. */
+       SR_CONF_NUM_ANALOG_PROBES,
+
        /*--- Special stuff -------------------------------------------------*/
 
        /** Scan options supported by the driver. */
@@ -799,9 +824,6 @@ enum {
        /** The device supports specifying the capturefile unit size. */
        SR_CONF_CAPTURE_UNITSIZE,
 
-       /** The device supports setting the number of probes. */
-       SR_CONF_CAPTURE_NUM_PROBES,
-
        /** Power off the device. */
        SR_CONF_POWER_OFF,
 
@@ -946,6 +968,8 @@ struct sr_dev_driver {
 };
 
 /**
+ * @struct sr_session
+ *
  * Opaque data structure representing a libsigrok session. None of the fields
  * of this structure are meant to be accessed directly.
  */