tools/pyboard.py: Change logic for when raw ">" prompt is parsed.

dpgeorge · dpgeorge · commit d59ca4efdbcf · 2015-06-15T23:28:04.000+01:00
In raw REPL "&gt;" indicates the prompt.  We originally read this character
upon entering the raw REPL, and after reading the last bit of the
output.  This patch changes the logic so the "&gt;" is read only just
before trying to send the next command.  To make this work (and as an
added feature) the input buffer is now flushed upon entering raw REPL.

The main reason for this change is so that pyboard.py recognises the EOF
when sys.exit() is called on the pyboard.  Ie, if you run pyboard.py
with a script that calls sys.exit(), then pyboard.py will exit after
the sys.exit() is called.
diff --git a/tools/pyboard.py b/tools/pyboard.py
@@ -71,14 +71,22 @@ def read_until(self, min_num_bytes, ending, timeout=10, data_consumer=None):
 
     def enter_raw_repl(self):
         self.serial.write(b'\r\x03\x03') # ctrl-C twice: interrupt any running program
+
+        # flush input (without relying on serial.flushInput())
+        n = self.serial.inWaiting()
+        while n > 0:
+            self.serial.read(n)
+            n = self.serial.inWaiting()
+
         self.serial.write(b'\r\x01') # ctrl-A: enter raw REPL
         data = self.read_until(1, b'to exit\r\n>')
         if not data.endswith(b'raw REPL; CTRL-B to exit\r\n>'):
             print(data)
             raise PyboardError('could not enter raw repl')
+
         self.serial.write(b'\x04') # ctrl-D: soft reset
-        data = self.read_until(1, b'to exit\r\n>')
-        if not data.endswith(b'raw REPL; CTRL-B to exit\r\n>'):
+        data = self.read_until(1, b'to exit\r\n')
+        if not data.endswith(b'raw REPL; CTRL-B to exit\r\n'):
             print(data)
             raise PyboardError('could not enter raw repl')
 
@@ -93,8 +101,8 @@ def follow(self, timeout, data_consumer=None):
         data = data[:-1]
 
         # wait for error output
-        data_err = self.read_until(2, b'\x04>', timeout=timeout)
-        if not data_err.endswith(b'\x04>'):
+        data_err = self.read_until(1, b'\x04', timeout=timeout)
+        if not data_err.endswith(b'\x04'):
             raise PyboardError('timeout waiting for second EOF reception')
         data_err = data_err[:-2]
 
@@ -107,6 +115,11 @@ def exec_raw_no_follow(self, command):
         else:
             command_bytes = bytes(command, encoding='utf8')
 
+        # check we have a prompt
+        data = self.read_until(1, b'>')
+        if not data.endswith(b'>'):
+            raise PyboardError('could not enter raw repl')
+
         # write command
         for i in range(0, len(command_bytes), 256):
             self.serial.write(command_bytes[i:min(i + 256, len(command_bytes))])
