"); - send_text(s, scope_idn(sc));

X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/rigol/blobdiff_plain/7d42ad7efe4c26e33498016c9f49acd214b5428e..78fb09842aa3a0b87a4fe84a1ab93bfc7252d934:/rigold.c diff --git a/rigold.c b/rigold.c index 111c5d6..29712e0 100644 --- a/rigold.c +++ b/rigold.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "scope.h" #include "commands.h" @@ -30,19 +31,95 @@ static int send_binary(int s, char *buf, int len) return 0; } -static int send_text(int s, char *buf) +static int send_text(int s, char *fmt, ...) { - return send_binary(s, buf, strlen(buf)); + va_list argp; + char buf[4096]; + int cnt; + + va_start(argp, fmt); + cnt = vsnprintf(buf, sizeof(buf), fmt, argp); + va_end(argp); + + if (cnt < 0) + return cnt; + + return send_binary(s, buf, cnt); +} + +static int send_command_output(int s, struct scope *sc, char *cmd) +{ + unsigned char buf[1024*1024]; + int res; + + res = sendscpi(sc, cmd, buf, sizeof(buf)); + send_binary(s, (char*)buf, res); + + return res; } static void serve_index(int s, struct scope *sc, char *param) { send_text(s, "HTTP/1.0 200 OK\n"); send_text(s, "Content-type: text/html\n\n"); - send_text(s, ""); - send_text(s, scope_idn(sc)); - send_text(s, "\n"); + send_text(s, "%s\n", scope_idn(sc)); send_text(s, "

\n"); + send_text(s, "
\n"); + + claimscope(sc); + update_scope_status(sc); + + send_text(s, "System: Language: %s, Counter: %d, Beep: %d
\n", + sc->status.system.lang, + sc->status.system.counter_enabled, + sc->status.system.beep_enabled); + + send_text(s, "Keyboard: Key Lock: %d
\n", + sc->status.keyboard.key_lock); + + 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, "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, "
\n"); + + 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_chan1); + 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_chan2); + + releasescope(sc); + + send_text(s, sc->status.system.lang); + send_text(s, "
\n"); send_text(s, "\n"); + send_text(s, "RUN "); + send_text(s, "STOP "); + send_text(s, "FORCE "); if (param) { - unsigned char buf[1024*1024]; - int res; - claimscope(sc); if (strchr (param, '?')) { - res = sendscpi(sc, param, buf, sizeof(buf)); send_text(s, "

< ");
 			send_text(s, param);
 			send_text(s, "\n> ");
-			send_binary(s, (char*)buf, res);
+			send_command_output(s, sc, param);
 			send_text(s, "

\n"); } else { sendscpi(sc, param, NULL, 0); @@ -188,6 +264,9 @@ static void parse_request(int s, struct scope *sc) memmove(token+1, token+3, strlen(token)-2); } + while ((token = strchr(param, '+')) != NULL) { + *token = ' '; + } } if (strcmp("/", file) == 0) {