X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/rigol/blobdiff_plain/ad9fbc05e664d9e4028ec9c17fcc7308a4524114..759a1836af8a88a8eff08c731a894e380c829f02:/rigold.c diff --git a/rigold.c b/rigold.c index 4d4d0b3..29712e0 100644 --- a/rigold.c +++ b/rigold.c @@ -5,11 +5,15 @@ #include #include #include -#include +#include +#include +#include -#include "usbtmc.h" +#include "scope.h" #include "commands.h" +#define TIMEOUT 4 + static int send_binary(int s, char *buf, int len) { int ret; @@ -27,35 +31,141 @@ 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 void serve_index(int s) +static int send_command_output(int s, struct scope *sc, char *cmd) { - send_text(s, "HTTP/1.0 200 OK"); + 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, "Rigol DS1000\n"); - 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) { + claimscope(sc); + if (strchr (param, '?')) { + send_text(s, "

< ");
+			send_text(s, param);
+			send_text(s, "\n> ");
+			send_command_output(s, sc, param);
+			send_text(s, "

\n"); + } else { + sendscpi(sc, param, NULL, 0); + } + releasescope(sc); + } send_text(s, "\n"); } -static void serve_lcd(int s, struct usb_dev_handle *sc) +static void serve_lcd(int s, struct scope *sc) { char buf[256]; int imglen; unsigned char *png; - usbtmc_claim(sc); + claimscope(sc); png = get_lcd(sc, &imglen, 0); - usbtmc_release(sc); + releasescope(sc); if (png == NULL) return; - send_text(s, "HTTP/1.0 200 OK"); + send_text(s, "HTTP/1.0 200 OK\n"); send_text(s, "Content-type: image/png\n"); snprintf(buf, sizeof(buf), "Content-length: %u\n\n", imglen); send_text(s, buf); @@ -63,16 +173,48 @@ static void serve_lcd(int s, struct usb_dev_handle *sc) free(png); } -static void parse_request(int s, struct usb_dev_handle *sc) +static void serve_404(int s) +{ + send_text(s, "HTTP/1.0 404 Not found\n"); + send_text(s, "Content-type: text/html\n\n"); + send_text(s, "404"); + send_text(s, "\n"); + send_text(s, "

404

"); + send_text(s, "\n"); +} + +int is_eor(char *buf) +{ + int eor = 0; + + /* This does not completely work, when the request is split + in multiple packets... */ + if (strstr(buf, "\x0d\x0a\x0d\x0a")) { + eor = 1; + } else if (strstr(buf, "\x0a\x0a")) { + eor = 1; + } else if (strcmp(buf, "\x0d\x0a") == 0) { + eor = 1; + } else if (strcmp(buf, "\x0a") == 0) { + eor = 1; + } + + return eor; +} + + +static void parse_request(int s, struct scope *sc) { int ret; - char buf[1024]; - char file[1024]; + int eor; + char buf[4096]; + char file[4096]; const char delim[] = " \t\x0d\x0a"; - const char crlf[] = "\x0d\x0a"; char *saveptr; char *token; + char *param = NULL; + alarm(TIMEOUT); ret=read(s, buf, sizeof(buf)-1); if (ret == -1) { perror("read"); @@ -80,45 +222,104 @@ static void parse_request(int s, struct usb_dev_handle *sc) } buf[ret] = 0; + eor = is_eor(buf); + token = strtok_r(buf, delim, &saveptr); + if (token == NULL) + return; /* TODO: Only GET... */ token = strtok_r(NULL, delim, &saveptr); + if (token == NULL) + return; bzero(&file, sizeof(file)); strncpy(file, token, sizeof(file)-1); - do { - token = strtok_r(NULL, crlf, &saveptr); - /* TODO: FIXME */ - #if 0 - if (token == NULL) { - ret=read(s, buf, sizeof(buf)-1); - if (ret == -1) { - perror("read"); - return; - } - buf[ret] = 0; - token = strtok_r(buf, crlf, &saveptr); + while (!eor) { + alarm(TIMEOUT); + ret=read(s, buf, sizeof(buf)-1); + if (ret == -1) { + perror("read"); + return; + } + buf[ret] = 0; + eor = is_eor(buf); + } + alarm(0); + + param = strchr(file, '?'); + if (param) { + *param = 0; + param++; + + while ((token = strchr(param, '%')) != NULL) { + char buf[3]; + + if (strlen(token+1) < 2) + break; + + strncpy(buf, token+1, 3); + buf[2] = 0; + + *token = (char)strtoul(buf, NULL, 16); + memmove(token+1, token+3, strlen(token)-2); + + } + while ((token = strchr(param, '+')) != NULL) { + *token = ' '; } - #endif - } while(token != NULL); + } if (strcmp("/", file) == 0) { - serve_index(s); - } else if (strcmp("/lcd.png", file) == 0) { + serve_index(s, sc, param); + } else if (strcmp("/cgi-bin/lcd", file) == 0) { serve_lcd(s, sc); + } else { + serve_404(s); + } +} + +void sighandler(int sig) +{ + switch(sig) { + case SIGPIPE: + break; + case SIGALRM: + default: + printf("Signal %d received\n", sig); + break; } } int main(int argc, char **argv) { + struct sigaction act; int sock, csock; int opt; socklen_t slen; - struct usb_dev_handle *sc; + struct scope *sc; struct sockaddr_in sin, clientsin; - unsigned short port = 8888; + unsigned short port = 8088; - sc = usbtmc_initscope(); + sc = initscope(); + if (sc == NULL) { + printf("Scope not found!\n"); + exit(EXIT_FAILURE); + } + + bzero(&act, sizeof(act)); + act.sa_handler = sighandler; + act.sa_flags = SA_RESTART; + if (sigaction(SIGPIPE, &act, NULL) == -1) { + perror("sigaction"); + exit(EXIT_FAILURE); + } + + bzero(&act, sizeof(act)); + act.sa_handler = sighandler; + if (sigaction(SIGALRM, &act, NULL) == -1) { + perror("sigaction"); + exit(EXIT_FAILURE); + } if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) { perror("socket"); @@ -157,6 +358,6 @@ int main(int argc, char **argv) close(csock); } - usbtmc_close(sc); + closescope(sc); return 0; }