hantek-dso: support for SR_HWCAP_COUPLING

[libsigrok.git] / hardware / hantek-dso / dso.h

diff --git a/hardware/hantek-dso/dso.h b/hardware/hantek-dso/dso.h
index 6e35a985859e53cfd7b272621431dd76f580356d..145f584bae6034893bf04cf629751f66447a1570 100644 (file)
--- a/hardware/hantek-dso/dso.h
+++ b/hardware/hantek-dso/dso.h
@@ -32,15 +32,12 @@
 
 #define MAX_CAPTURE_EMPTY      3
 
-#define DEFAULT_VOLTAGE            VOLTAGE_2V
+#define DEFAULT_VOLTAGE            VDIV_500MV
 #define DEFAULT_FRAMESIZE          FRAMESIZE_SMALL
-#define DEFAULT_TIMEBASE           TIME_1ms
-#define DEFAULT_TRIGGER_SOURCE     TRIGGER_CH1
+#define DEFAULT_TIMEBASE           TIME_100us
+#define DEFAULT_TRIGGER_SOURCE     "CH1"
 #define DEFAULT_COUPLING           COUPLING_AC
-#define DEFAULT_SELECTED_CHANNEL   SELECT_CH1CH2
-/* Halfway between min and max = 0V */
-#define DEFAULT_HORIZ_TRIGGERPOS   0x1400
-
+#define DEFAULT_HORIZ_TRIGGERPOS   0.5
 #define DEFAULT_VERT_OFFSET        0.5
 #define DEFAULT_VERT_TRIGGERPOS    0.0
 
@@ -70,28 +67,19 @@ enum dso_commands {
        CMD_GET_CHANNELDATA,
        CMD_GET_CAPTURESTATE,
        CMD_SET_VOLTAGE,
+       /* unused */
        cmdSetLogicalData,
        cmdGetLogicalData
 };
 
-enum voltages {
-       VOLTAGE_5V = 0,
-       VOLTAGE_2V,
-       VOLTAGE_1V,
-       VOLTAGE_500mV,
-       VOLTAGE_200mV,
-       VOLTAGE_100mV,
-       VOLTAGE_50mV,
-       VOLTAGE_20mV,
-       VOLTAGE_10mV
-};
-
+/* Must match the coupling table. */
 enum couplings {
        COUPLING_AC = 0,
        COUPLING_DC,
-       COUPLING_OFF
+       COUPLING_GND
 };
 
+/* Must match the timebases table. */
 enum time_bases {
        TIME_10us = 0,
        TIME_20us,
@@ -110,6 +98,19 @@ enum time_bases {
        TIME_400ms
 };
 
+/* Must match the vdivs table. */
+enum {
+       VDIV_10MV,
+       VDIV_20MV,
+       VDIV_50MV,
+       VDIV_100MV,
+       VDIV_200MV,
+       VDIV_500MV,
+       VDIV_1V,
+       VDIV_2V,
+       VDIV_5V,
+};
+
 enum trigger_slopes {
        SLOPE_POSITIVE = 0,
        SLOPE_NEGATIVE
@@ -118,15 +119,7 @@ enum trigger_slopes {
 enum trigger_sources {
        TRIGGER_CH2 = 0,
        TRIGGER_CH1,
-       TRIGGER_ALT,
        TRIGGER_EXT,
-       TRIGGER_EXT10
-};
-
-enum selected_channels {
-       SELECT_CH1 = 0,
-       SELECT_CH2,
-       SELECT_CH1CH2
 };
 
 enum capturestates {
@@ -169,6 +162,8 @@ struct context {
        struct dso_profile *profile;
        struct sr_usb_dev_inst *usb;
        void *cb_data;
+       uint64_t limit_frames;
+       uint64_t num_frames;
        /* We can't keep track of an FX2-based device after upgrading
         * the firmware (it re-enumerates into a different device address
         * after the upgrade) this is like a global lock. No device will open
@@ -192,14 +187,13 @@ struct context {
        float voffset_ch2;
        float voffset_trigger;
        uint16_t channel_levels[2][9][2];
-       int selected_channel;
        int framesize;
        gboolean filter_ch1;
        gboolean filter_ch2;
        gboolean filter_trigger;
        int triggerslope;
-       int triggersource;
-       int triggerposition;
+       char *triggersource;
+       float triggerposition;
        int triggermode;
 };