X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/rigol/blobdiff_plain/adb5a679e9a34b10b262efe2c917619515a59f7b..f416d675a06903504d86cab1e7b1065b98ab5705:/scope.h

diff --git a/scope.h b/scope.h
index 86ce9df..6c4f954 100644
--- a/scope.h
+++ b/scope.h
@@ -26,12 +26,21 @@ struct measure_s {
 };
 
 struct channel_s {
-	/* TODO */
+	int bwlimit_enabled;
+	char coupling[32];
+	int displayed;
+	int inverted;
+	double offset;
+	double probe;
+	double scale;
+	int filter_enabled;
+	int memory_depth;
+	char vernier[32];
 };
 
 struct scope {
 	struct {
-		struct usb_dev_handle *dev;
+		struct libusb_device_handle *dev;
 		int ep_bulk_out;
 		int ep_bulk_in;
 		unsigned int wMaxPacketSize_in;
@@ -92,6 +101,8 @@ struct scope {
 		} timebase;
 
 		struct {
+			char mode[32];
+			
 			/* TODO */
 		} trigger;
 
@@ -100,9 +111,14 @@ struct scope {
 		} la;
 
 		struct {
-			/* TODO */
+			int displayed;
 		} math;
+
+		struct {
+			int displayed;
+		} fft;
 	} status;
+
 	char idn[128];
 };
 
@@ -119,3 +135,4 @@ int scope_get_int(struct scope *sc, char *cmd);
 double scope_get_double(struct scope *sc, char*cmd);
 void update_scope_measurements(struct scope *sc);
 int update_scope_status(struct scope *sc);
+char *scope_get_data(struct scope *sc, char *source, int *len);