add measurements to web if

[rigol] / scope.h

diff --git a/scope.h b/scope.h
index cef5e650e4c5125527b410b046ba80d714f13817..86ce9df009d67399d1f53fa179b43d9496e7d687 100644 (file)
--- a/scope.h
+++ b/scope.h
@@ -1,3 +1,34 @@
+struct measure_s {
+       double vpp;
+       double vmax;
+       double vmin;
+       double vamplitude;
+       double vtop;
+       double vbase;
+       double vaverage;
+       double vrms;
+
+       double overshoot;
+       double preshoot;
+
+       double frequency;
+       double risetime;
+       double falltime;
+
+       double period;
+       double pwidth;
+       double nwidth;
+       double pdutycycle;
+       double ndutycycle;
+
+       double pdelay;
+       double ndelay;
+};
+
+struct channel_s {
+       /* TODO */
+};
+
 struct scope {
        struct {
                struct usb_dev_handle *dev;
@@ -20,24 +51,36 @@ struct scope {
                } keyboard;
 
                struct {
-                       /* TODO */
+                       struct measure_s ch1;
+                       struct measure_s ch2;
+
+                       int total;
+                       char source[32];
                } measure;
 
                struct {
                        char type[32];
                        char mode[32];
                        int averages;
-                       double srate_chan1;
-                       double srate_chan2;
+                       double srate_ch1;
+                       double srate_ch2;
                        double srate_digital;
                } acquire;
 
                struct {
-                       /* TODO */
+                       char type[32];
+                       char grid[32];
+                       int persist;
+                       char mnudisplay[32];
+                       int mnustatus;
+                       char screen[32];
+                       int brightness;
+                       int intensity;
                } display;
 
                struct {
-                       /* TODO */
+                       struct channel_s ch1;
+                       struct channel_s ch2;
                } channel;
 
                struct {
@@ -74,4 +117,5 @@ char *scope_get_string(struct scope *sc, char *cmd, int maxlen);
 int scope_get_truth_value(struct scope *sc, char *cmd);
 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);