aboutsummaryrefslogtreecommitdiffstats
path: root/klippy
diff options
context:
space:
mode:
authorDaniel <daniel.a.joyce@gmail.com>2019-02-10 08:51:29 -0800
committerKevin O'Connor <kevin@koconnor.net>2019-04-14 11:27:43 -0400
commit7373e9209214cd90cf98498e0f5d94375ddfb115 (patch)
treed8bc981f0b8c6c97d0aaef7cede12d23da374db1 /klippy
parent41ce7cdf1c49720bd3bc1db27c8986bc18a88a34 (diff)
downloadkutter-7373e9209214cd90cf98498e0f5d94375ddfb115.tar.gz
kutter-7373e9209214cd90cf98498e0f5d94375ddfb115.tar.xz
kutter-7373e9209214cd90cf98498e0f5d94375ddfb115.zip
serialhdl: Enforce exclusive access on POSIX, this is default behavior on windows. (#1216)
Signed-off-by: Daniel Joyce <daniel.a.joyce@gmail.com>
Diffstat (limited to 'klippy')
-rw-r--r--klippy/serialhdl.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/klippy/serialhdl.py b/klippy/serialhdl.py
index 1751a226..90d6ca92 100644
--- a/klippy/serialhdl.py
+++ b/klippy/serialhdl.py
@@ -58,7 +58,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:
@@ -284,7 +284,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