tools/mpremote: Remove support for pyb.USB_VCP in/out specialisation.

The sys.stdin.buffer and sys.stdout.buffer streams work just as well (and
are just as fast) as pyb.USB_VCP on stm32 devices, so there's no need to
have the USB_VCP specialisation code, which just adds complexity.

Also, on stm32 devices with both USB and UART (or other serial interface),
if something other than the USB_VCP port is used for the serial connection
then mpremote mount will not work because it will default to reading and
writing on USB_VCP instead of the other connected serial stream.

As part of this simplification, support for a second port as input is
removed (this feature was never exposed to the user).

Signed-off-by: Damien George <damien@micropython.org>

tools/mpremote/mpremote/pyboardextended.py

@@ -24,27 +24,18 @@ fs_hook_cmds = {
 }
 
 fs_hook_code = """\
-import uos, uio, ustruct, micropython, usys
+import uos, uio, ustruct, micropython
 
 SEEK_SET = 0
 
 class RemoteCommand:
-    def __init__(self, use_second_port):
+    def __init__(self):
+        import uselect, usys
         self.buf4 = bytearray(4)
-        try:
+        self.fout = usys.stdout.buffer
-            import pyb
+        self.fin = usys.stdin.buffer
-            self.fout = pyb.USB_VCP()
+        self.poller = uselect.poll()
-            if use_second_port:
+        self.poller.register(self.fin, uselect.POLLIN)
-                self.fin = pyb.USB_VCP(1)
-            else:
-                self.fin = pyb.USB_VCP()
-        except:
-            import usys
-            self.fout = usys.stdout.buffer
-            self.fin = usys.stdin.buffer
-        import select
-        self.poller = select.poll()
-        self.poller.register(self.fin, select.POLLIN)
 
     def poll_in(self):
         for _ in self.poller.ipoll(1000):
@@ -317,8 +308,8 @@ class RemoteFS:
         return RemoteFile(c, fd, mode.find('b') == -1)
 
 
-def __mount(use_second_port):
+def __mount():
-    uos.mount(RemoteFS(RemoteCommand(use_second_port)), '/remote')
+    uos.mount(RemoteFS(RemoteCommand()), '/remote')
     uos.chdir('/remote')
 """
 
@@ -571,28 +562,14 @@ class PyboardExtended(Pyboard):
         self.device_name = dev
         self.mounted = False
 
-    def mount_local(self, path, dev_out=None):
+    def mount_local(self, path):
         fout = self.serial
-        if dev_out is not None:
-            try:
-                fout = serial.Serial(dev_out)
-            except serial.SerialException:
-                port = list(serial.tools.list_ports.grep(dev_out))
-                if not port:
-                    raise
-                for p in port:
-                    try:
-                        fout = serial.Serial(p.device)
-                        break
-                    except serial.SerialException:
-                        pass
         self.mounted = True
         if self.eval('"RemoteFS" in globals()') == b"False":
             self.exec_(fs_hook_code)
-        self.exec_("__mount(%s)" % (dev_out is not None))
+        self.exec_("__mount()")
         self.cmd = PyboardCommand(self.serial, fout, path)
         self.serial = SerialIntercept(self.serial, self.cmd)
-        self.dev_out = dev_out
 
     def soft_reset_with_mount(self, out_callback):
         self.serial.write(b"\x04")
@@ -618,7 +595,7 @@ class PyboardExtended(Pyboard):
             n = self.serial.inWaiting()
         self.serial.write(b"\x01")
         self.exec_(fs_hook_code)
-        self.exec_("__mount(%s)" % (self.dev_out is not None))
+        self.exec_("__mount()")
         self.exit_raw_repl()
         self.read_until(4, b">>> ")
         self.serial = SerialIntercept(self.serial, self.cmd)