X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/rigol/blobdiff_plain/9f8a3f5c570aed9489b7536a389badecaac921cd..1574729632acebdcdf8caa025dcb67c6ac3804fc:/rigold.c
diff --git a/rigold.c b/rigold.c
index c399dc5..d8e4b19 100644
--- a/rigold.c
+++ b/rigold.c
@@ -60,6 +60,9 @@ static int send_command_output(int s, struct scope *sc, char *cmd)
static void serve_index(int s, struct scope *sc, char *param)
{
+ int i;
+ struct channel_s *ch;
+
send_text(s, "HTTP/1.0 200 OK\n");
send_text(s, "Content-type: text/html\n\n");
send_text(s, "%s\n", scope_idn(sc));
@@ -68,6 +71,7 @@ static void serve_index(int s, struct scope *sc, char *param)
claimscope(sc);
update_scope_status(sc);
+ releasescope(sc);
send_text(s, "System: Language: %s, Counter: %d, Beep: %d
\n",
sc->status.system.lang,
@@ -112,18 +116,6 @@ static void serve_index(int s, struct scope *sc, char *param)
sc->status.measure.ch1.pdelay,
sc->status.measure.ch1.ndelay);
- send_text(s, "Acquire: Type: %s, Mode: %s, Averages: %d
\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
\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, "Measure CH2:
\n");
send_text(s, "VPP: %lg, VMAX: %lg, VMIN: %lg, VAMPLITUDE: %lg, VTOP: %lg, VBASE: %lg, VAVERAGE: %lg, VRMS: %lg
\n",
sc->status.measure.ch2.vpp,
@@ -155,19 +147,14 @@ static void serve_index(int s, struct scope *sc, char *param)
sc->status.measure.ch2.pdelay,
sc->status.measure.ch2.ndelay);
- send_text(s, "Acquire: Type: %s, Mode: %s, Averages: %d
\n",
+ send_text(s, "
Acquire: Type: %s, Mode: %s, Averages: %d, CH1: %.10lg samples/s, CH2: %.10lg samples/s
\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
\n",
- sc->status.timebase.mode,
- sc->status.timebase.offset,
- sc->status.timebase.delayed_offset,
- sc->status.timebase.scale,
- sc->status.timebase.format);
+ sc->status.acquire.averages,
+ sc->status.acquire.srate_ch1,
+ sc->status.acquire.srate_ch2);
- send_text(s, "Display: Type: %s, Grid: %s, Persist: %d, MNUDisplay: %s, MNUStatus: %d, Screen: %s, Brightness: %d, Intensity: %d
\n",
+ send_text(s, "
Display: Type: %s, Grid: %s, Persist: %d, MNUDisplay: %s, MNUStatus: %d, Screen: %s, Brightness: %d, Intensity: %d
\n",
sc->status.display.type,
sc->status.display.grid,
sc->status.display.persist,
@@ -176,21 +163,35 @@ static void serve_index(int s, struct scope *sc, char *param)
sc->status.display.screen,
sc->status.display.brightness,
sc->status.display.intensity);
+
+ for (i = 1; i <= 2; i++) {
+ if (i == 1) {
+ ch = &(sc->status.channel.ch1);
+ } else {
+ ch = &(sc->status.channel.ch2);
+ }
+ send_text(s, "Channel %d: ", i);
+
+ send_text(s, "BWLimit: %d, Coupling: %s, Displayed: %d, Inverted: %d, Offset: %lg, Probe: %lgX, Scale: %lg, Filter: %d, Memory Depth: %d, Vernier: %s
\n",
+ ch->bwlimit_enabled,
+ ch->coupling,
+ ch->displayed,
+ ch->inverted,
+ ch->offset,
+ ch->probe,
+ ch->scale,
+ ch->filter_enabled,
+ ch->memory_depth,
+ ch->vernier);
+ }
- 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
\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
\n", sc->status.acquire.srate_ch2);
-
- releasescope(sc);
+ send_text(s, "
Horizontal: Mode: %s, Offset: %lg, Delayed Offset: %lg, Scale: %lg, Format: %s
\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, sc->status.system.lang);
send_text(s, "
\n");
send_text(s, "