aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel <daniel.a.joyce@gmail.com>2019-02-10 08:51:29 -0800
committerKevinOConnor <kevin@koconnor.net>2019-02-10 11:51:29 -0500
commitfdbbda948419932be2bf93a932ae91ffc7f94e7f (patch)
tree50519a581f27b4175b2f98811b1249512161f5a7
parentcd6a18142908738d83590aa6e5af2d191055bfdf (diff)
downloadkutter-fdbbda948419932be2bf93a932ae91ffc7f94e7f.tar.gz
kutter-fdbbda948419932be2bf93a932ae91ffc7f94e7f.tar.xz
kutter-fdbbda948419932be2bf93a932ae91ffc7f94e7f.zip
serialhdl: Enforce exclusive access on POSIX, this is default behavior on windows. (#1216)
Signed-off-by: Daniel Joyce <daniel.a.joyce@gmail.com>
-rw-r--r--klippy/serialhdl.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/klippy/serialhdl.py b/klippy/serialhdl.py
index 0aa477c5..8d031fbc 100644
--- a/klippy/serialhdl.py
+++ b/klippy/serialhdl.py
@@ -59,7 +59,7 @@ class SerialReader:
try:
if self.baud:
self.ser = serial.Serial(
- self.serialport, self.baud, timeout=0)
+ self.serialport, self.baud, timeout=0, exclusive=True)
else:
self.ser = open(self.serialport, 'rb+')
except (OSError, IOError, serial.SerialException) as e:
@@ -285,7 +285,7 @@ def stk500v2_leave(ser, reactor):
# Attempt an arduino style reset on a serial port
def arduino_reset(serialport, reactor):
# First try opening the port at a different baud
- ser = serial.Serial(serialport, 2400, timeout=0)
+ ser = serial.Serial(serialport, 2400, timeout=0, exclusive=True)
ser.read(1)
reactor.pause(reactor.monotonic() + 0.100)
# Then toggle DTR