Changeset 4601

Timestamp:

08/21/08 09:48:11 (5 years ago)

Author:

werner

Message:

Committing changes that have piled up. The things under lib/ are ugly,
incomplete, and buggy. Don't try to use them yet.

• usbtmc.c: improper handling of the "vendor=" option
• telnet.c: added option "nl" to suppress warning on extra newline (note that this makes parameter parsing ambiguous - to be fixed later)
• lib/: added a number of Python scripts to implement properly abstracted access to instruments (work in progress, still very limited)

Location:

developers/werner/ahrt/host/tmc

Files:

• lib (added)
• lib/function.py (added)
• lib/instrument.py (added)
• lib/meter.py (added)
• lib/power.py (added)
• lib/scope.py (added)
• lib/trigger.py (added)
• lib/wave.py (added)
• telnet.c (modified) (5 diffs)
• usbtmc.c (modified) (1 diff)

developers/werner/ahrt/host/tmc/telnet.c

@@ -57 +57 @@
         int sd;         /* socket descriptor */
         int crlf;       /* 0 = in message, 1 = CR seen, 2 = CRLF seen */
+        int nl;         /* 0 = complain about extra \n, 1 = don't */
         int max_tries;  /* number of times we try to set up the connection */
         int tries_left; /* number of attempts left */
@@ -67 +68 @@
 static void usage(void)
 {
-        fprintf(stderr, "usage: \"telnet\", [tries=N,] host [, port]\n");
+        fprintf(stderr, "usage: \"telnet\", [tries=N,] [nl,] host [, port]\n");
 }
 
@@ -106 +107 @@
         unsigned long num;
         char *end;
-
-        if (argc && strchr(argv[0], '=')) {
-                if (strncmp(argv[0], "tries=", 6)) {
-                        usage();
-                        return NULL;
-                }
-                tries = strtoul(argv[0]+6, &end, 0);
-                if (*end || !tries) {
-                        usage();
-                        return NULL;
-                }
-                argc--;
-                argv++;
-        }
-        if (!argc || argc > 2) {
-                usage();
-                return NULL;
-        }
-        host = argv[0];
-        port = argc == 2 ? argv[1] : DEFAULT_PORT;
+        int i;
 
         d = malloc(sizeof(struct telnet_dsc));
@@ -132 +114 @@
                 return NULL;
         }
+        d->nl = 0;
+
+        for (i = 0; i != argc; i++) {
+                if (!strncmp(argv[i], "tries=", 6)) {
+                        tries = strtoul(argv[0]+6, &end, 0);
+                        if (*end || !tries) {
+                                usage();
+                                return NULL;
+                        }
+                }
+                else if (!strcmp(argv[i], "nl")) {
+                        d->nl = 1;
+                }
+                else
+                        break;
+        }
+        if (i == argc || i-argc > 2) {
+                usage();
+                return NULL;
+        }
+        host = argv[i];
+        port = argc > i+1 ? argv[i+1] : DEFAULT_PORT;
+
         d->crlf = 0;
 
@@ -264 +269 @@
                                 break;
                         case '\n':
-                                if (d->crlf != 1)
+                                if (d->crlf != 1 && !d->nl)
                                         fprintf(stderr,
                                             "warning: unexpected \\n\n");

developers/werner/ahrt/host/tmc/usbtmc.c

@@ -453 +453 @@
                 }
                 else if (!strncmp(argv[i], "vendor=", 7)) {
-                        device = strtoul(argv[i]+7, &end, 0);
+                        vendor = strtoul(argv[i]+7, &end, 0);
                         if (*end || !vendor || vendor > 0xffff)
                                 goto usage;