Changeset 12 for trunk/software/tty/readtty_timer.c

Timestamp:

Jul 31, 2019, 5:44:55 PM (5 years ago)

Author:

bouyer

Message:

Host software for the v2 firmware

File:

• trunk/software/tty/readtty_timer.c (modified) (10 diffs)

trunk/software/tty/readtty_timer.c

@@ -3 +3 @@
 #include <unistd.h>
 #include <errno.h>
+#include <err.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <string.h>
 #include <termios.h>
 #include <sys/ioctl.h>
+#include <sys/select.h>
 
 volatile int quit;
@@ -14 +17 @@
 {
         quit = 1;
+}
+
+static void
+readline(int d, char *buf, int l)
+{
+        int i;
+        int bytes;
+        do {
+                for (i = 0; i < l; i++) {
+                        do {
+                                bytes = read(d, &buf[i], 1);
+                                if (quit)
+                                        return;
+                        } while ((bytes < 0 && errno == EAGAIN) || buf[i] == '\r');
+                        if (bytes != 1) {
+                                fprintf(stderr, "readline: read %d\n", bytes);
+                                err(1, "read line");
+                        }
+                        if (buf[i] == '\n')
+                                break;
+                }
+        } while (i == 0);
+        if (buf[i] != '\n') {
+                errx(1, "realine: end of line not found");
+        }
+        buf[i] = '\0';
 }
 
@@ -25 +54 @@
         int i;
         fd_set rfds;
-        char gpio[2], current[4], tension[4];
+        char gpio[3], current[4], tension[4];
         char *endp;
-        int currenti, tensioni;
-        int val;
+        int gpioi, currenti, tensioni;
+        int gpioval, currentval, tensionval;
+        int exitst = 0;
 
         enum {
@@ -41 +71 @@
 
         state = INIT;
-        currenti = tensioni = 0;
+        gpioi = currenti = tensioni = 0;
 
         if (argc != 3) {
@@ -87 +117 @@
         }
         fprintf(stderr, "tty ready\n");
+        write(d, "M0\n", 3);
+        write(d, "M0\n", 3);
+        do {
+                readline(d, buf, sizeof(buf));
+                if (quit)
+                        goto quit;
+        } while (memcmp(buf, "OK", 2) != 0);
+        fprintf(stderr, "starting\n");
+        write(d, "M1\n", 3);
+
         alarm(atoi(argv[2]));
         FD_ZERO(&rfds);
@@ -94 +134 @@
                 if (nfds > 0 && FD_ISSET(d, &rfds)) {
                         bytes = read(d, buf, sizeof(buf));
+                        if (bytes > sizeof(buf)) {
+                                errx(1, "read %d/0x%x bytes", bytes, bytes);
+                        }
                         if (bytes < 0 && errno != EAGAIN) {
                                 warn("read");
+                                continue;
                         }
                         for (i = 0; i < bytes; i++) {
+                                if (i > sizeof(buf))
+                                        abort();
+                                if (bytes > sizeof(buf))
+                                        abort();
+                                if (gpioi > sizeof(buf))
+                                        abort();
+                                if (tensioni > sizeof(buf))
+                                        abort();
+                                if (currenti > sizeof(buf))
+                                        abort();
                                 switch(state) {
                                 case INIT:
                                         /* look for an X mark */
-                                        if (buf[i] == 'X')
+                                        if (buf[i] == 'X') {
                                                 state = GPIO;
+                                                gpioi = 0;
+                                        }
                                         break;
                                 case GPIO:
-                                        gpio[0] = buf[i];
-                                        gpio[1] = '\0';
-                                        val = strtol(gpio, &endp, 16);
+                                        gpio[gpioi] = buf[i];
+                                        gpioi++;
+                                        if (gpioi < 2)
+                                                break;
+                                        gpio[gpioi] = '\0';
+                                        gpioval = strtol(gpio, &endp, 16);
                                         if (*endp != '\0') {
                                                 fprintf(stderr,
                                                     "gpio error: %c\n",
                                                     *endp);
-                                                state = INIT;
-                                        } else {
-                                                state = CURRENT;
-                                                currenti = 0;
-                                                printf("%2d ", val);
+                                                exitst = 1;
+                                                state = INIT;
+                                        } else {
+                                                state = TENSION;
+                                                tensioni = 0;
                                         }
                                         break;
@@ -125 +184 @@
                                                 break;
                                         current[currenti] = '\0';
-                                        val = strtol(current, &endp, 16);
+                                        currentval = strtol(current, &endp, 16);
                                         if (*endp != '\0') {
                                                 fprintf(stderr,
                                                     "current error: %c\n",
                                                     *endp);
-                                                state = INIT;
-                                        } else {
-                                                state = TENSION;
+                                                exitst = 1;
+                                                state = INIT;
+                                        } else {
+                                                state = MARK;
                                                 tensioni = 0;
-                                                printf("%4d ", val);
                                         }
                                         break;
@@ -143 +202 @@
                                                 break;
                                         tension[tensioni] = '\0';
-                                        val = strtol(tension, &endp, 16);
+                                        tensionval = strtol(tension, &endp, 16);
                                         if (*endp != '\0') {
                                                 fprintf(stderr,
                                                     "tension error: %c\n",
                                                     *endp);
-                                                state = INIT;
-                                        } else {
-                                                state = MARK;
-                                                printf("%4d\n", val);
+                                                exitst = 1;
+                                                state = INIT;
+                                        } else {
+                                                state = CURRENT;
+                                                currenti = 0;
                                         }
                                         break;
@@ -159 +219 @@
                                                     "mark error: %c\n",
                                                     buf[i]);
-                                                state = INIT;
-                                        } else {
+                                                exitst = 1;
+                                                state = INIT;
+                                        } else {
+                                                printf("%3d ", gpioval);
+                                                printf("%4d ", tensionval);
+                                                printf("%4d\n", currentval);
                                                 state = GPIO;
+                                                gpioi = 0;
                                         }
                                         break;
@@ -170 +235 @@
                 }
         }
+quit:
+        /* stop measures */
+        write(d, "M0\n", 3);
+        if (fflush(stdout) == EOF) {  
+                warn("fflush");       
+        }
+
         if (tcsetattr(d, TCSANOW, &ot) < 0) {
                 err(1, "restore tcsetattr");
         }
-        exit(0);
+        exit(exitst);
 }