X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fhantek-dso%2Fdso.h;h=aa0cd8be001ab6e20c788b80df7861668f08adc3;hb=f4575b6549ded99ec5380b4d6fafa899f5cb65ae;hp=42077c0ab51a1404e02c089b9212c13f06b7a504;hpb=a370ef19161cee7016b7d24a2b9cef95b1191f6d;p=libsigrok.git

diff --git a/hardware/hantek-dso/dso.h b/hardware/hantek-dso/dso.h
index 42077c0a..aa0cd8be 100644
--- a/hardware/hantek-dso/dso.h
+++ b/hardware/hantek-dso/dso.h
@@ -32,14 +32,14 @@
 
 #define MAX_CAPTURE_EMPTY      3
 
-#define DEFAULT_VOLTAGE            VOLTAGE_2V
+#define DEFAULT_VOLTAGE            VDIV_500MV
 #define DEFAULT_FRAMESIZE          FRAMESIZE_SMALL
 #define DEFAULT_TIMEBASE           TIME_100us
 #define DEFAULT_TRIGGER_SOURCE     "CH1"
 #define DEFAULT_COUPLING           COUPLING_AC
 #define DEFAULT_HORIZ_TRIGGERPOS   0.5
 #define DEFAULT_VERT_OFFSET        0.5
-#define DEFAULT_VERT_TRIGGERPOS    0.0
+#define DEFAULT_VERT_TRIGGERPOS    0.5
 
 #define MAX_VERT_TRIGGER           0xfe
 
@@ -67,28 +67,20 @@ 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
+	/* TODO not used, how to enable? */
+	COUPLING_GND
 };
 
+/* Must match the timebases table. */
 enum time_bases {
 	TIME_10us = 0,
 	TIME_20us,
@@ -107,6 +99,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