X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fhantek-dso%2Fdso.h;h=53d953e12fa4f024576532ee6722f3351d06df3e;hb=313deed219c39a902e6b7c39cf519c3476b9798d;hp=1a0c69deb4326ee2884b704e13cebbc2b4f528a0;hpb=6e71ef3b6f27c3f3e1c5d5dc4e2f60caf54fc818;p=libsigrok.git

diff --git a/hardware/hantek-dso/dso.h b/hardware/hantek-dso/dso.h
index 1a0c69de..53d953e1 100644
--- a/hardware/hantek-dso/dso.h
+++ b/hardware/hantek-dso/dso.h
@@ -32,14 +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
-/* 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
 
@@ -69,22 +67,11 @@ 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
-};
-
 enum couplings {
 	COUPLING_AC = 0,
 	COUPLING_DC,
@@ -109,6 +96,19 @@ enum time_bases {
 	TIME_400ms
 };
 
+/* Must match the vdivs table, these are just handy indexes into it. */
+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
@@ -117,9 +117,7 @@ enum trigger_slopes {
 enum trigger_sources {
 	TRIGGER_CH2 = 0,
 	TRIGGER_CH1,
-	TRIGGER_ALT,
 	TRIGGER_EXT,
-	TRIGGER_EXT10
 };
 
 enum capturestates {
@@ -192,8 +190,8 @@ struct context {
 	gboolean filter_ch2;
 	gboolean filter_trigger;
 	int triggerslope;
-	int triggersource;
-	int triggerposition;
+	char *triggersource;
+	float triggerposition;
 	int triggermode;
 };