diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-02-10 11:57:02 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-02-10 11:57:02 -0500 |
| commit | 59a60d68f55c1f05dda2959311390011835f3af7 (patch) | |
| tree | ecd40c2bebf5abfa3db9912448256618e5c918e4 /klippy/serialhdl.py | |
| parent | faedc776218ace1acdfa78d39078b042f479d01c (diff) | |
| download | kutter-59a60d68f55c1f05dda2959311390011835f3af7.tar.gz kutter-59a60d68f55c1f05dda2959311390011835f3af7.tar.xz kutter-59a60d68f55c1f05dda2959311390011835f3af7.zip | |
Revert "serialhdl: Enforce exclusive access on POSIX, this is default behavior on windows. (#1216)"
This reverts commit fdbbda948419932be2bf93a932ae91ffc7f94e7f.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/serialhdl.py')
| -rw-r--r-- | klippy/serialhdl.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/klippy/serialhdl.py b/klippy/serialhdl.py index 8d031fbc..0aa477c5 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, exclusive=True) + self.serialport, self.baud, timeout=0) 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, exclusive=True) + ser = serial.Serial(serialport, 2400, timeout=0) ser.read(1) reactor.pause(reactor.monotonic() + 0.100) # Then toggle DTR |