remove comment on M3 and M5, configure scale factors

thlaser.py

@@ -96,8 +96,8 @@ VERSION = "1.30"
 
 STRAIGHT_TOLERANCE = 0.0001
 STRAIGHT_DISTANCE_TOLERANCE = 0.0001
-LASER_ON = "M3 (LASER ON)\n"          # Peter - LASER ON MCODE
-LASER_OFF = "M5 (LASER OFF)\n"        # Peter - LASER OFF MCODE
+LASER_ON = "M3\n"          # Peter - LASER ON MCODE
+LASER_OFF = "M5\n"        # Peter - LASER OFF MCODE
 TOOL_CHANGE = "T%02d (select tool)\nM6 (tool change)\n\n"
 
 HEADER_TEXT = '%%\n(Generated by thlaser v%s inkscape plugin)\n(based on code from gcode_tools)\n\nG96 S90 (set spindle speed so M3/M5 will work)\n' % VERSION
@@ -585,7 +585,7 @@ class Gcode_tools(inkex.Effect):
             if self.options.generate_not_parametric_code:
                 f = " F%f" % self.options.feed
             else:
-                f = " F#4"
+                f = " F100"
 
         cwArc = "G02"
         ccwArc = "G03"
@@ -845,11 +845,11 @@ class Gcode_tools(inkex.Effect):
 
         if not self.options.generate_not_parametric_code:
             gcode += """
-#1  = %f (Scale X - relative to the dimensions shown in svg)
-#2  = %f (Scale Y - relative to the dimensions shown in svg)
-#4  = %f (Feed rate units/min)
-#8  = %f (Offset x)
-#9  = %f (Offset y)
+1.0  = %f (Scale X - relative to the dimensions shown in svg)
+1.0  = %f (Scale Y - relative to the dimensions shown in svg)
+100  = %f (Feed rate units/min)
+0.0  = %f (Offset x)
+0.0  = %f (Offset y)
         \n""" % (self.options.Xscale, self.options.Yscale, self.options.feed, self.options.Xoffset, self.options.Yoffset)
 
         #if self.options.function == 'Curve':