X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/rigol/blobdiff_plain/759a1836af8a88a8eff08c731a894e380c829f02..adb5a679e9a34b10b262efe2c917619515a59f7b:/rigold.c

diff --git a/rigold.c b/rigold.c
index 29712e0..e97db7c 100644
--- a/rigold.c
+++ b/rigold.c
@@ -69,13 +69,48 @@ static void serve_index(int s, struct scope *sc, char *param)
 	claimscope(sc);
 	update_scope_status(sc);
 
-	send_text(s, "System: Language: %s, Counter: %d, Beep: %d<br>\n",
+	send_text(s, "System: Language: %s, Counter: %d, Beep: %d<br><br>\n",
 		sc->status.system.lang,
 		sc->status.system.counter_enabled,
 		sc->status.system.beep_enabled);
 	
-	send_text(s, "Keyboard: Key Lock: %d<br>\n",
+	send_text(s, "Keyboard: Key Lock: %d<br><br>\n",
 		sc->status.keyboard.key_lock);
+	
+	send_text(s, "Measure: Source: %s, Total: %d<br>\n",
+		sc->status.measure.source,
+		sc->status.measure.total);
+
+	send_text(s, "Measure CH1:<br>\n");
+	send_text(s, "VPP: %lg, VMAX: %lg, VMIN: %lg, VAMPLITUDE: %lg, VTOP: %lg, VBASE: %lg, VAVERAGE: %lg, VRMS: %lg<br>\n",
+		sc->status.measure.ch1.vpp,
+		sc->status.measure.ch1.vmax,
+		sc->status.measure.ch1.vmin,
+		sc->status.measure.ch1.vamplitude,
+		sc->status.measure.ch1.vtop,
+		sc->status.measure.ch1.vbase,
+		sc->status.measure.ch1.vaverage,
+		sc->status.measure.ch1.vrms);
+	
+	send_text(s, "Overshoot: %lg, Preshoot: %lg<br>\n",
+		sc->status.measure.ch1.overshoot,
+		sc->status.measure.ch1.preshoot);
+
+	send_text(s, "Frequency: %lg, Risetime: %lg, Falltime: %lg<br>\n",
+		sc->status.measure.ch1.frequency,
+		sc->status.measure.ch1.risetime,
+		sc->status.measure.ch1.falltime);
+
+	send_text(s, "Period: %lg, Pwidth: %lg, Nwidth: %lg, Pdutycycle: %lg, Ndutycycle: %lg<br>\n",
+		sc->status.measure.ch1.period,
+		sc->status.measure.ch1.pwidth,
+		sc->status.measure.ch1.nwidth,
+		sc->status.measure.ch1.pdutycycle,
+		sc->status.measure.ch1.ndutycycle);
+
+	send_text(s, "Pdelay: %lg, Ndelay: %lg<br>\n",
+		sc->status.measure.ch1.pdelay,
+		sc->status.measure.ch1.ndelay);
 
 	send_text(s, "Acquire: Type: %s, Mode: %s, Averages: %d<br>\n",
 		sc->status.acquire.type,
@@ -89,32 +124,69 @@ static void serve_index(int s, struct scope *sc, char *param)
 		sc->status.timebase.scale,
 		sc->status.timebase.format);
 
-	send_text(s, "Display: ");
-	send_command_output(s, sc, ":DISP:TYPE?");
-	send_text(s, ", ");
-	send_command_output(s, sc, ":DISP:SCR?");
-	send_text(s, ", Grid: ");
-	send_command_output(s, sc, ":DISP:GRID?");
-	send_text(s, ", Persistence: ");
-	send_command_output(s, sc, ":DISP:PERS?");
-	send_text(s, ", Menu: ");
-	send_command_output(s, sc, ":DISP:MNUS?");
-	send_text(s, ", Brightness: ");
-	send_command_output(s, sc, ":DISP:BRIG?");
-	send_text(s, ", Intensity: ");
-	send_command_output(s, sc, ":DISP:INT?");
-	send_text(s, "<br>\n");
+	send_text(s, "Measure CH2:<br>\n");
+	send_text(s, "VPP: %lg, VMAX: %lg, VMIN: %lg, VAMPLITUDE: %lg, VTOP: %lg, VBASE: %lg, VAVERAGE: %lg, VRMS: %lg<br>\n",
+		sc->status.measure.ch2.vpp,
+		sc->status.measure.ch2.vmax,
+		sc->status.measure.ch2.vmin,
+		sc->status.measure.ch2.vamplitude,
+		sc->status.measure.ch2.vtop,
+		sc->status.measure.ch2.vbase,
+		sc->status.measure.ch2.vaverage,
+		sc->status.measure.ch2.vrms);
+	
+	send_text(s, "Overshoot: %lg, Preshoot: %lg<br>\n",
+		sc->status.measure.ch2.overshoot,
+		sc->status.measure.ch2.preshoot);
+
+	send_text(s, "Frequency: %lg, Risetime: %lg, Falltime: %lg<br>\n",
+		sc->status.measure.ch2.frequency,
+		sc->status.measure.ch2.risetime,
+		sc->status.measure.ch2.falltime);
+
+	send_text(s, "Period: %lg, Pwidth: %lg, Nwidth: %lg, Pdutycycle: %lg, Ndutycycle: %lg<br>\n",
+		sc->status.measure.ch2.period,
+		sc->status.measure.ch2.pwidth,
+		sc->status.measure.ch2.nwidth,
+		sc->status.measure.ch2.pdutycycle,
+		sc->status.measure.ch2.ndutycycle);
+
+	send_text(s, "Pdelay: %lg, Ndelay: %lg<br>\n",
+		sc->status.measure.ch2.pdelay,
+		sc->status.measure.ch2.ndelay);
+
+	send_text(s, "Acquire: Type: %s, Mode: %s, Averages: %d<br>\n",
+		sc->status.acquire.type,
+		sc->status.acquire.mode,
+		sc->status.acquire.averages);
+
+	send_text(s, "Horizontal: Mode: %s, Offset: %lg, Delayed Offset: %lg, Scale: %lg, Format: %s<br><br>\n",
+		sc->status.timebase.mode,
+		sc->status.timebase.offset,
+		sc->status.timebase.delayed_offset,
+		sc->status.timebase.scale,
+		sc->status.timebase.format);
+
+	send_text(s, "Display: Type: %s, Grid: %s, Persist: %d, MNUDisplay: %s, MNUStatus: %d, Screen: %s, Brightnbess: %d, Intensity: %d<br><br>\n",
+		sc->status.display.type,
+		sc->status.display.grid,
+		sc->status.display.persist,
+		sc->status.display.mnudisplay,
+		sc->status.display.mnustatus,
+		sc->status.display.screen,
+		sc->status.display.brightness,
+		sc->status.display.intensity);
 
 	send_text(s, "Channel 1: ");
 	send_command_output(s, sc, ":CHAN1:DISP?");
 	send_text(s, ", ");
 	send_command_output(s, sc, ":CHAN1:MEMD?");
-	send_text(s, " sample depth, %.10lg samples/s<br>\n", sc->status.acquire.srate_chan1);
+	send_text(s, " sample depth, %.10lg samples/s<br>\n", sc->status.acquire.srate_ch1);
 	send_text(s, "Channel 2: ");
 	send_command_output(s, sc, ":CHAN2:DISP?");
 	send_text(s, ", ");
 	send_command_output(s, sc, ":CHAN2:MEMD?");
-	send_text(s, " sample depth, %.10lg samples/s<br>\n", sc->status.acquire.srate_chan2);
+	send_text(s, " sample depth, %.10lg samples/s<br>\n", sc->status.acquire.srate_ch2);
 
 	releasescope(sc);