From 058c231d7eb8f17e92d898c4b80b3822dcc5e353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20W=C3=BCst?= <sebi@timewaster.de>
Date: Sat, 9 Nov 2013 19:29:34 +0100
Subject: fixed flow control problem in plotter extension

(bzr r12783)
---
 share/extensions/plotter.inx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'share/extensions/plotter.inx')

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">&#xa0;</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>
-- 
cgit v1.2.3


From 9b5f6b893852940b30d8797469d2b8b14f0ecbe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20W=C3=BCst?= <sebi@timewaster.de>
Date: Sat, 9 Nov 2013 19:48:52 +0100
Subject: added missing translation flags and a small text change

(bzr r12784)
---
 share/extensions/plotter.inx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'share/extensions/plotter.inx')

diff --git a/share/extensions/plotter.inx b/share/extensions/plotter.inx
index cca325cf2..526ab1bd3 100644
--- a/share/extensions/plotter.inx
+++ b/share/extensions/plotter.inx
@@ -27,10 +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="">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>
+                <_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">&#xa0;</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>
-- 
cgit v1.2.3


From 297f45e2e4ab293f036a7199ec80f9c3008cdcb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20W=C3=BCst?= <sebi@timewaster.de>
Date: Sun, 10 Nov 2013 14:06:03 +0100
Subject: fixed and optimized pyserial usage, added dmpl support, small stuff

(bzr r12787)
---
 share/extensions/plotter.inx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'share/extensions/plotter.inx')

diff --git a/share/extensions/plotter.inx b/share/extensions/plotter.inx
index 526ab1bd3..49bcf837e 100644
--- a/share/extensions/plotter.inx
+++ b/share/extensions/plotter.inx
@@ -26,11 +26,15 @@
                 <option value="57600">57600</option>
                 <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="">None</_option>
+            <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: Software)">
                 <_option value="xonxoff">Software (XON/XOFF)</_option>
                 <_option value="rtscts">Hardware (RTS/CTS)</_option>
                 <_option value="dsrdtrrtscts">Hardware (DSR/DTR + RTS/CTS)</_option>
+                <_option value="">None</_option>
+            </param>
+            <param name="commandLanguage" type="optiongroup" appearance="minimal" _gui-text="Command Language" _gui-description="The command language to use - Try different settings to find the one that fits your plotter (Default: HPGL)">
+                <option value="hpgl">HPGL</option>
+                <option value="dmpl">DMPL</option>
             </param>
             <param name="space" type="description">&#xa0;</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>
@@ -38,7 +42,7 @@
             <_param name="hpglNote" type="description">Please note that only the HPGL command language is supported at the moment.</_param>
         </page>
         <page name="plotter" _gui-text="Plotter Settings">
-            <param name="pen" type="int" min="0" max="10" _gui-text="Pen number" _gui-description="The number of the pen (tool) to use, on most plotters 1 (Standard: '1')">1</param>
+            <param name="pen" type="int" min="0" max="99" _gui-text="Pen number" _gui-description="The number of the pen (tool) to use, on most plotters 1 (Standard: '1')">1</param>
             <param name="resolutionX" type="float" min="1.0" max="4096.0" precision="1" _gui-text="Resolution X (dpi)" _gui-description="The amount of steps the cutter moves if it moves for 1 inch on the X axis - Try different settings to find the one that fits your plotter (Default: 1016.0)">1016.0</param>
             <param name="resolutionY" type="float" min="1.0" max="4096.0" precision="1" _gui-text="Resolution Y (dpi)" _gui-description="The amount of steps the cutter moves if it moves for 1 inch on the Y axis - Try different settings to find the one that fits your plotter (Default: 1016.0)">1016.0</param>
             <param name="mirrorX" type="boolean" _gui-text="Mirror X-axis" _gui-description="Check this to mirror the X axis (Default: Unchecked)">false</param>
-- 
cgit v1.2.3