diff options
| author | Sebastian Wüst <sebi@timewaster.de> | 2013-11-09 18:29:34 +0000 |
|---|---|---|
| committer | Sebastian Wüst <sebi@timewaster.de> | 2013-11-09 18:29:34 +0000 |
| commit | 058c231d7eb8f17e92d898c4b80b3822dcc5e353 (patch) | |
| tree | 64e4d5b4ceaf9379a0d1438df8ee31560535ef40 | |
| parent | First step of moving tools into appropriate namespaces. (diff) | |
| download | inkscape-058c231d7eb8f17e92d898c4b80b3822dcc5e353.tar.gz inkscape-058c231d7eb8f17e92d898c4b80b3822dcc5e353.zip | |
fixed flow control problem in plotter extension
(bzr r12783)
| -rw-r--r-- | share/extensions/plotter.inx | 7 | ||||
| -rw-r--r-- | share/extensions/plotter.py | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/share/extensions/plotter.inx b/share/extensions/plotter.inx index b950e0246..cca325cf2 100644 --- a/share/extensions/plotter.inx +++ b/share/extensions/plotter.inx @@ -27,9 +27,10 @@ <option value="115200">115200</option> </param> <param name="flowControl" type="optiongroup" appearance="minimal" _gui-text="Flow control" _gui-description="Software / Hardware flow control - Try different settings to find the one that fits your plotter (Default: None)"> - <option value="0">None</option> - <option value="1">Software (XON/XOFF)</option> - <option value="2">Hardware (RTS/CTS)</option> + <option value="">None</option> + <option value="xonxoff">Software (XON/XOFF)</option> + <option value="rtscts">Hardware (RTS/CTS)</option> + <option value="dsrdtrrtscts">Hardware (DSR/DTR + RTS/CTS)</option> </param> <param name="space" type="description"> </param> <_param name="serialHelp" type="description">This can be a physical serial connection or a USB-to-Serial bridge. Ask your plotter manufacturer for drivers if needed.</_param> diff --git a/share/extensions/plotter.py b/share/extensions/plotter.py index aef9e016d..d518de4c9 100644 --- a/share/extensions/plotter.py +++ b/share/extensions/plotter.py @@ -98,10 +98,12 @@ class MyEffect(inkex.Effect): raise ValueError, ("", type, value), traceback ''' # send data to plotter - if self.options.flowControl == '1': + if self.options.flowControl == 'xonxoff': mySerial = serial.Serial(port=self.options.serialPort, baudrate=self.options.serialBaudRate, timeout=0.1, writeTimeout=10, xonxoff=True) - elif self.options.flowControl == '2': - mySerial = serial.Serial(port=self.options.serialPort, baudrate=self.options.serialBaudRate, timeout=0.1, writeTimeout=10, dsrdtr=None, rtscts=True) + elif self.options.flowControl == 'rtscts': + mySerial = serial.Serial(port=self.options.serialPort, baudrate=self.options.serialBaudRate, timeout=0.1, writeTimeout=10, rtscts=True) + elif self.options.flowControl == 'dsrdtrrtscts': + mySerial = serial.Serial(port=self.options.serialPort, baudrate=self.options.serialBaudRate, timeout=0.1, writeTimeout=10, dsrdtr=True, rtscts=True) else: mySerial = serial.Serial(port=self.options.serialPort, baudrate=self.options.serialBaudRate, timeout=0.1, writeTimeout=10) try: |