From 1204d6bb2ccd61f03decd0b489b04f537db2e901 Mon Sep 17 00:00:00 2001
From: Marcus <marcus@hardt-it.de>
Date: Thu, 28 Dec 2023 19:55:44 +0100
Subject: [PATCH] add options for grbl and for prepending dwell time

---
 laser/laser.inx | 2 ++
 laser/laser.py  | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/laser/laser.inx b/laser/laser.inx
index ba91e63..cc6bf3b 100644
--- a/laser/laser.inx
+++ b/laser/laser.inx
@@ -22,6 +22,8 @@
             <param name="tool_power_command" type="string" gui-text="Tool Power Command">M3 S255;</param>
             <param name="tool_off_command" type="string" gui-text="Tool Off Command">M5;</param>
             <param name="dwell_time" type="float" gui-text="Dwell Time Before Moving (ms)">0</param>
+            <param name="dwell_time_for_grbl" gui-text="Adjust Dwell Time for grbl (s vs ms)" type="bool">true</param>
+            <param name="dwell_before_cut" gui-text="Apply Dwell Time before cut (not after)" type="bool">true</param>
             <spacer/>
             <param name="draw_debug" type="bool" gui-text="Draw Debug">true</param>
             <param name="debug_line_width" type="float" gui-text="Debug Line Width (px)">0.5</param>
diff --git a/laser/laser.py b/laser/laser.py
index 0d5ac94..6cfcef2 100644
--- a/laser/laser.py
+++ b/laser/laser.py
@@ -110,9 +110,12 @@ def effect(self):
             footer.append(interface_instance.linear_move(x=0, y=0))
 
         # Generate gcode
+        corrected_dwell_time = self.options.dwell_time
+        if self.options.dwell_time_for_grbl:
+            corrected_dwell_time = self.options.dwell_time/1000
         gcode_compiler = Compiler(custom_interface, self.options.travel_speed, self.options.cutting_speed,
-                                  self.options.pass_depth, dwell_time=self.options.dwell_time, custom_header=header,
-                                  custom_footer=footer, unit=self.options.unit)
+                                  self.options.pass_depth, dwell_time=corrected_dwell_time, custom_header=header,
+                                  custom_footer=footer, unit=self.options.unit, dwell_before_cut=self.options.dwell_before_cut)
 
         transformation = Transformation()