Fix auto-restart timeout in tools/readserial.py
authorKevin O'Connor <kevin@koconnor.net>
Mon, 27 Apr 2009 01:24:16 +0000 (21:24 -0400)
committerKevin O'Connor <kevin@koconnor.net>
Mon, 27 Apr 2009 01:24:16 +0000 (21:24 -0400)
The timer should reset after 60 seconds of idle, not after 60
    seconds.

tools/readserial.py

index 8b20fd27be33383ef979f489c49f424a7926146c..4524ca831fb7fe7a51ec2695e452bc7ca5ebe6cf 100755 (executable)
@@ -20,8 +20,7 @@ RESTARTINTERVAL = 60
 ADJUSTBAUD = 1
 
 def readserial(infile, logfile, baudrate):
-    starttime = 0
-    isnewline = 1
+    lasttime = 0
     while 1:
         # Read data
         try:
@@ -32,19 +31,20 @@ def readserial(infile, logfile, baudrate):
         if sys.stdin in res[0]:
             # Got keyboard input - force reset on next serial input
             sys.stdin.read(1)
-            starttime = 0
+            lasttime = 0
             if len(res[0]) == 1:
                 continue
         curtime = time.time()
         d = infile.read(4096)
 
         # Reset start time if no data for some time
-        if curtime - starttime > RESTARTINTERVAL:
+        if curtime - lasttime > RESTARTINTERVAL:
             starttime = curtime
             charcount = 0
             isnewline = 1
             sys.stdout.write("\n")
             logfile.write("\n")
+        lasttime = curtime
 
         # Translate unprintable chars; add timestamps
         out = ""