diff --git a/laser.inx b/laser.inx index 3b5ff81..a648cf4 100644 --- a/laser.inx +++ b/laser.inx @@ -5,12 +5,13 @@ laser.py inkex.py - M03 - M05 - 3000 - 750 - 255 - 0 + M03 + M05 + 3000 + 750 + 1000 + 0,2 + 0,2 1 1 diff --git a/laser.py b/laser.py index cb29263..6e9db6b 100644 --- a/laser.py +++ b/laser.py @@ -637,6 +637,9 @@ class LaserGcode(inkex.Effect): {"name": "--power-delay", "type": str, "dest": "power_delay", "default": "0", "help": "Laser power-on delay (ms},"}, + {"name": "--power-off-delay", "type": str, "dest": "power_off_delay", + "default": "0", "help": "Laser power-on delay (ms},"}, + {"name": "--suppress-all-messages", "type": inkex.Boolean, "dest": "suppress_all_messages", "default": True, "help": "Hide messages during g-code generation"}, @@ -932,7 +935,7 @@ class LaserGcode(inkex.Effect): while (g != root): if 'transform' in list(g.keys()): t = g.get('transform') - t = [list(row) for row in Transform(t).matrix] + t = [list(row) for row in Transform(t).matrix] trans = [list(row) for row in (Transform(t) * Transform(trans)).matrix] if trans != [] else t print_(trans) g = g.getparent() @@ -1452,7 +1455,7 @@ class LaserGcode(inkex.Effect): "gcode before path": ("G4 P0 \n" + self.options.laser_command + " S" + str( int(self.options.laser_power)) + "\nG4 P" + self.options.power_delay), "gcode after path": ( - "G4 P0 \n" + self.options.laser_off_command + " S0" + "\n" + "G1 F" + self.options.travel_speed), + "G4 P" + self.options.power_off_delay + "\n" + self.options.laser_off_command + " S0" + "\nG4 P0.25" + "\n" + "G1 F" + self.options.travel_speed), } self.get_info() diff --git a/laserCode.zip b/laserCode.zip new file mode 100644 index 0000000..2b0b31e Binary files /dev/null and b/laserCode.zip differ