Allow Users to directly set power on and off commands

JTechPhotonics · May 21, 2021 · d040ef5 · d040ef5
1 parent 0627295
commit d040ef5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/laser/laser.inx b/laser/laser.inx
@@ -23,13 +23,9 @@
 		</page>
 
 		<page name="advanced_settings" gui-text="Advanced Settings">
-			<param name="laser_power_command" type="string" _gui-text="Laser Power Command">M3</param>
-			<param name="laser_off_command" type="string" _gui-text="Laser Off Command">M5</param>
+			<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="laser_power_range" type="enum" _gui-text="Laser Power Range">
-				<item value="255">0-255</item>
-				<item value="12000">0-12000</item>
-			</param>
 			<spacer></spacer>
 			<param name="draw_debug" type="boolean" _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
@@ -7,7 +7,6 @@
 from svg_to_gcode.svg_parser import parse_root, Transformation, debug_methods
 from svg_to_gcode.geometry import LineSegmentChain
 from svg_to_gcode.compiler import Compiler, interfaces
-from svg_to_gcode.formulas import linear_map
 from svg_to_gcode import TOLERANCES
 
 svg_name_space = "http://www.w3.org/2000/svg"
@@ -17,7 +16,7 @@
 inx_filename = "laser.inx"
 
 
-def generate_custom_interface(laser_off_command, laser_power_command, laser_power_range):
+def generate_custom_interface(laser_off_command, laser_power_command):
     """Wrapper function for generating a Gcode interface with a custom laser power command"""
 
     class CustomInterface(interfaces.Gcode):
@@ -27,14 +26,10 @@ def __init__(self):
             super().__init__()
 
         def laser_off(self):
-            return f"{laser_off_command};"
+            return f"{laser_off_command}"
 
-        def set_laser_power(self, power):
-            if power < 0 or power > 1:
-                raise ValueError(f"{power} is out of bounds. Laser power must be given between 0 and 1. "
-                                 f"The interface will scale it correctly.")
-
-            return f"{laser_power_command} S{linear_map(0, int(laser_power_range), power)};"
+        def set_laser_power(self, _):
+            return f"{laser_power_command}"
 
     return CustomInterface
 
@@ -79,8 +74,7 @@ def effect(self):
             self.debug(f"Footer file does not exist at {self.options.footer_path}")
 
         # Customize header/footer
-        custom_interface = generate_custom_interface(self.options.laser_off_command, self.options.laser_power_command,
-                                                     self.options.laser_power_range)
+        custom_interface = generate_custom_interface(self.options.tool_off_command, self.options.tool_power_command)
         interface_instance = custom_interface()
 
         if self.options.do_laser_off_start: