summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a>2006-02-05 23:02:46 +0000
committercliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a>2006-02-05 23:02:46 +0000
commitaaa04609cbd8302f21a89072da54fab208758541 (patch)
treea693daadf6fc7dfd969eaa5074d8703bc2bdd98b
parentcf709e60209253f0cda8d7390b1a157e0d8fd890 (diff)
downloadpyserial-git-aaa04609cbd8302f21a89072da54fab208758541.tar.gz
- duration can be specified for sendBreak
- default duration increased to 0.25s
-rw-r--r--pyserial/CHANGES.txt3
-rw-r--r--pyserial/serial/serialjava.py6
-rw-r--r--pyserial/serial/serialposix.py6
-rw-r--r--pyserial/serial/serialwin32.py7
4 files changed, 11 insertions, 11 deletions
diff --git a/pyserial/CHANGES.txt b/pyserial/CHANGES.txt
index 6152501..5163aa9 100644
--- a/pyserial/CHANGES.txt
+++ b/pyserial/CHANGES.txt
@@ -239,6 +239,7 @@ Version 2.3 xxx
---------------------------
New Features:
-- iterator interface. "for line in Serial(...): ..." is now possible
+- iterator interface. ``for line in Serial(...): ...`` is now possible
Sugested by Bernhard Bender
+- ``sendBreak()`` accepts a ``duration`` argument. Default duration increased.
diff --git a/pyserial/serial/serialjava.py b/pyserial/serial/serialjava.py
index 90b0896..c2421b0 100644
--- a/pyserial/serial/serialjava.py
+++ b/pyserial/serial/serialjava.py
@@ -9,7 +9,7 @@
import javax.comm
from serialutil import *
-VERSION = "$Revision: 1.8 $".split()[1] #extract CVS version
+VERSION = "$Revision: 1.9 $".split()[1] #extract CVS version
def device(portnumber):
@@ -152,10 +152,10 @@ class Serial(SerialBase):
if not self.sPort: raise portNotOpenError
self._outstream.flush()
- def sendBreak(self):
+ def sendBreak(self, duration=0.25):
"""Send break condition."""
if not self.sPort: raise portNotOpenError
- self.sPort.sendBreak()
+ self.sPort.sendBreak(duration*1000.0)
def setRTS(self,on=1):
"""Set terminal status line: Request To Send"""
diff --git a/pyserial/serial/serialposix.py b/pyserial/serial/serialposix.py
index b057015..d3c0f8b 100644
--- a/pyserial/serial/serialposix.py
+++ b/pyserial/serial/serialposix.py
@@ -13,7 +13,7 @@
import sys, os, fcntl, termios, struct, select, errno
from serialutil import *
-VERSION = "$Revision: 1.28 $".split()[1] #extract CVS version
+VERSION = "$Revision: 1.29 $".split()[1] #extract CVS version
#Do check the Python version as some constants have moved.
if (sys.hexversion < 0x020100f0):
@@ -321,11 +321,11 @@ class Serial(SerialBase):
raise portNotOpenError
termios.tcflush(self.fd, TERMIOS.TCOFLUSH)
- def sendBreak(self):
+ def sendBreak(self, duration=0.25):
"""Send break condition."""
if self.fd is None:
raise portNotOpenError
- termios.tcsendbreak(self.fd, 0)
+ termios.tcsendbreak(self.fd, int(duration/0.25))
def setRTS(self,on=1):
"""Set terminal status line: Request To Send"""
diff --git a/pyserial/serial/serialwin32.py b/pyserial/serial/serialwin32.py
index cda6205..a83ccfe 100644
--- a/pyserial/serial/serialwin32.py
+++ b/pyserial/serial/serialwin32.py
@@ -11,7 +11,7 @@ import win32event # We use events and the WaitFor[Single|Multiple]Objects functi
import win32con # constants.
from serialutil import *
-VERSION = "$Revision: 1.31 $".split()[1] #extract CVS version
+VERSION = "$Revision: 1.32 $".split()[1] #extract CVS version
#from winbase.h. these should realy be in win32con
MS_CTS_ON = 16
@@ -237,13 +237,12 @@ class Serial(SerialBase):
if not self.hComPort: raise portNotOpenError
win32file.PurgeComm(self.hComPort, win32file.PURGE_TXCLEAR | win32file.PURGE_TXABORT)
- def sendBreak(self):
+ def sendBreak(self, duration=0.25):
"""Send break condition."""
if not self.hComPort: raise portNotOpenError
import time
win32file.SetCommBreak(self.hComPort)
- #TODO: how to set the correct duration??
- time.sleep(0.020)
+ time.sleep(duration)
win32file.ClearCommBreak(self.hComPort)
def setRTS(self,level=1):