diff --git a/tools/pyboard.py b/tools/pyboard.py
index 15ddfd745d589..c752557d0cc8c 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -153,13 +153,72 @@ def inWaiting(self):
else:
return n_waiting
+# A thread that constantly reads from subp stdout and puts data into a queue (FIFO list)
+# When tested, it reads double '\r' which messes up the further code, so if double '\r' detected, skip one
+def read_stream(stream, q):
+ data_prec = b""
+ while True:
+ data = stream.read(1)
+ if (data_prec == data) and (data_prec == b'\r'):
+ continue
+ else:
+ q.put(data)
+ data_prec = data
-class ProcessToSerial:
- "Execute a process and emulate serial connection using its stdin/stdout."
+class ProcessToSerialThreading:
+ "Execute a process and emulate serial connection using its stdin/stdout. Communication with stdout is done through the read_stream thread"
- def __init__(self, cmd):
+ def __init__(self, cmd):
import subprocess
+
+ # On Windows, preexec_fn parameter should be replaced by start_new_session
+ self.subp = subprocess.Popen(
+ cmd,
+ bufsize=0,
+ shell=True,
+ start_new_session=True,
+ stdin=subprocess.PIPE,
+ stdout=subprocess.PIPE,
+ )
+
+ # On Windows, select can not be used, a thread is used instead
+ # that constantly reads from subp.stdout and completes a queue
+ import threading
+ import queue
+ self.q = queue.Queue()
+ self.t = threading.Thread(target=read_stream, args=(self.subp.stdout, self.q))
+ self.t.daemon=True # Makes thread exit when main script exits
+ self.t.start()
+
+ def close(self):
+ import signal
+ os.kill(self.subp.pid, signal.SIGTERM)
+
+ def read(self, size=1):
+ data = b""
+ # On Windows, data will be read from the queue that is completed by the thread
+ i = 0
+ while i != size:
+ data += self.q.get()
+ i += 1
+ return data
+
+ def write(self, data):
+ self.subp.stdin.write(data)
+ return len(data)
+ def inWaiting(self):
+ if self.q.empty():
+ return 0
+ else:
+ return 1
+
+class ProcessToSerialPosix:
+ "Execute a process and emulate serial connection using its stdin/stdout. Using select to check if any data available on stdout"
+
+ def __init__(self, cmd):
+ import subprocess
+
self.subp = subprocess.Popen(
cmd,
bufsize=0,
@@ -168,7 +227,7 @@ def __init__(self, cmd):
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
)
-
+
# Initially was implemented with selectors, but that adds Python3
# dependency. However, there can be race conditions communicating
# with a particular child process (like QEMU), and selectors may
@@ -185,7 +244,6 @@ def __init__(self, cmd):
def close(self):
import signal
-
os.killpg(os.getpgid(self.subp.pid), signal.SIGTERM)
def read(self, size=1):
@@ -205,6 +263,12 @@ def inWaiting(self):
return 1
return 0
+# Class selector based on select module platform dependancy (available on Unix, but not on Windows)
+import select
+if hasattr(select, "poll"):
+ ProcessToSerial = ProcessToSerialPosix
+else:
+ ProcessToSerial = ProcessToSerialThreading
class ProcessPtyToTerminal:
"""Execute a process which creates a PTY and prints slave PTY as
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy