From: Michael Gernoth <michael@gernoth.net>
Date: Sat, 19 Jun 2010 16:36:02 +0000 (+0200)
Subject: math/fft added to scope status
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/rigol/commitdiff_plain/811f1259bdfc86f06fb13d7cde80befb4a808063

math/fft added to scope status
---

diff --git a/rigold.c b/rigold.c
index d8e4b19..93a5eb0 100644
--- a/rigold.c
+++ b/rigold.c
@@ -192,6 +192,9 @@ static void serve_index(int s, struct scope *sc, char *param)
 		sc->status.timebase.scale,
 		sc->status.timebase.format);
 
+	send_text(s, "<br>Math: Math Displayed: %d, FFT Displayed: %d<br>\n",
+		sc->status.math.displayed,
+		sc->status.fft.displayed);
 
 	send_text(s, "<br>\n");
 	send_text(s, "<form method=\"get\" action=\"\">\n");
diff --git a/scope.c b/scope.c
index 9b75ba4..ef14e72 100644
--- a/scope.c
+++ b/scope.c
@@ -268,5 +268,8 @@ int update_scope_status(struct scope *sc)
 	sc->status.timebase.scale = scope_get_double(sc, ":TIM:SCAL?");
 	COPY_SCOPE_STRING(sc, ":TIM:FORM?", sc->status.timebase.format);
 
+	sc->status.math.displayed = scope_get_truth_value(sc, ":MATH:DISP?");
+	sc->status.fft.displayed = scope_get_truth_value(sc, ":FFT:DISP?");
+
 	return 0;
 }
diff --git a/scope.h b/scope.h
index 453aaf6..dba5670 100644
--- a/scope.h
+++ b/scope.h
@@ -109,9 +109,14 @@ struct scope {
 		} la;
 
 		struct {
-			/* TODO */
+			int displayed;
 		} math;
+
+		struct {
+			int displayed;
+		} fft;
 	} status;
+
 	char idn[128];
 };