From febf98a2d30fb74a1c2f6b35f0932be5664161f6 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Tue, 30 Apr 2019 19:46:12 -0400
Subject: add grbl laser options for g-code output

---
 templates/output_params_txt.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'templates')

diff --git a/templates/output_params_txt.xml b/templates/output_params_txt.xml
index 3b78df3b..767ddc1a 100644
--- a/templates/output_params_txt.xml
+++ b/templates/output_params_txt.xml
@@ -1,4 +1,9 @@
     {# these parameters are for g-code files (*.txt) #}
-    <param name="flip_x" type="boolean" gui-description="{{ _("Negate x coordinates") }}">false</param>
-    <param name="flip_y" type="boolean" gui-description="{{ _("Negate y coordinates") }}">false</param>
-    <param name="stitch_z_travel" type="float" gui-description="{{ _("increment z coordinate by this amount per stitch") }}">5.0</param>
+    <param name="laser_mode" type="boolean" gui-text="{{ _("laser mode") }}" gui-description="{{ _("Laser mode (generate g-code for grbl laser mode)") }}">false</param>
+    <param name="flip_x" type="boolean" gui-text="{{ _("negate X coordinate values") }}" gui-description="{{ _("Negate x coordinates") }}">false</param>
+    <param name="flip_y" type="boolean" gui-text="{{ _("negate Y coordinate values") }}" gui-description="{{ _("Negate y coordinates") }}">false</param>
+    <param name="stitch_z_travel" type="float" gui-text="{{ _("Z travel per stitch") }}" gui-description="{{ _("increment z coordinate by this amount per stitch") }}">5.0</param>
+    <param name="spindle_speed" type="int" gui-text="{{ _("spindle speed") }}" gui-description="{{ _("spindle speed (laser power for laser mode, set to -1 to omit)") }}" min="-1" max="1000000000">-1</param>
+    <param name="min_spindle_speed" type="int" gui-text="{{ _("min spindle speed") }}" gui-description="{{ _("minimum spindle speed value (grbl $31 setting)") }}" min="-1" max="1000000000">-1</param>
+    <param name="max_spindle_speed" type="int" gui-text="{{ _("max spindle speed") }}" gui-description="{{ _("minimum spindle speed value (grbl $30 setting)") }}" min="-1" max="1000000000">-1</param>
+    <param name="feed_rate" type="int" gui-description="{{ _("feed rate (in mm/min, set to -1 to omit)")}}" min="-1" max="1000000000">-1</param>
\ No newline at end of file
-- 
cgit v1.3.1


From 64fdda07a8464f17d14f583974906801281e2df2 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Wed, 1 May 2019 20:44:43 -0400
Subject: add dynamic laser power toggle and laser warm up time option

---
 pyembroidery                    | 2 +-
 templates/output_params_txt.xml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'templates')

diff --git a/pyembroidery b/pyembroidery
index 6d14167c..b205cf5d 160000
--- a/pyembroidery
+++ b/pyembroidery
@@ -1 +1 @@
-Subproject commit 6d14167c94bb63f4f1536f9467945e2e7beb4357
+Subproject commit b205cf5dea49efdecb39df95bd29287fd5c15e5c
diff --git a/templates/output_params_txt.xml b/templates/output_params_txt.xml
index 767ddc1a..451a6ca9 100644
--- a/templates/output_params_txt.xml
+++ b/templates/output_params_txt.xml
@@ -1,5 +1,7 @@
     {# these parameters are for g-code files (*.txt) #}
     <param name="laser_mode" type="boolean" gui-text="{{ _("laser mode") }}" gui-description="{{ _("Laser mode (generate g-code for grbl laser mode)") }}">false</param>
+    <param name="dynamic_laser_power" type="boolean" gui-text="{{ _("dynamic laser power") }}" gui-description="{{ _("Use Grbl's M4 dynamic laser power mode.  Ensures consistent laser cutting power regardless of motor speed.  Only for PWM-capable lasers.") }}" min="0.0" max="5.0">true</param>
+    <param name="laser_warm_up_time" type="float" gui-text="{{ _("laser warm-up time") }}" gui-description="{{ _("When turning on the laser, wait this many seconds for laser to warm up (G4 command)") }}">0.0</param>
     <param name="flip_x" type="boolean" gui-text="{{ _("negate X coordinate values") }}" gui-description="{{ _("Negate x coordinates") }}">false</param>
     <param name="flip_y" type="boolean" gui-text="{{ _("negate Y coordinate values") }}" gui-description="{{ _("Negate y coordinates") }}">false</param>
     <param name="stitch_z_travel" type="float" gui-text="{{ _("Z travel per stitch") }}" gui-description="{{ _("increment z coordinate by this amount per stitch") }}">5.0</param>
-- 
cgit v1.3.1