diff --git a/src/pygcode/__init__.py b/src/pygcode/__init__.py index 8bf0a75..c5ce90a 100644 --- a/src/pygcode/__init__.py +++ b/src/pygcode/__init__.py @@ -53,7 +53,7 @@ __all__ = [ 'GCodeCancelCannedCycle', 'GCodeCancelToolLengthOffset', 'GCodeCannedCycle', - 'GCodeCannedCycleReturnLevel', + 'GCodeCannedCycleReturnPrevLevel', 'GCodeCannedCycleReturnToR', 'GCodeCannedReturnMode', 'GCodeCoolant', @@ -199,7 +199,7 @@ from .gcodes import ( # G83 - GCodeDrillingCyclePeck: G83: Drilling Cycle, Peck # G76 - GCodeThreadingCycle: G76: Threading Cycle # - GCodeCannedReturnMode: - # G98 - GCodeCannedCycleReturnLevel: G98: Canned Cycle Return to the level set prior to cycle start + # G98 - GCodeCannedCycleReturnPrevLevel: G98: Canned Cycle Return to the level set prior to cycle start # G99 - GCodeCannedCycleReturnToR: G99: Canned Cycle Return to the level set by R # - GCodeCoolant: # M08 - GCodeCoolantFloodOn: M8: turn flood coolant on @@ -330,7 +330,7 @@ from .gcodes import ( GCodeCancelCannedCycle, GCodeCancelToolLengthOffset, GCodeCannedCycle, - GCodeCannedCycleReturnLevel, + GCodeCannedCycleReturnPrevLevel, GCodeCannedCycleReturnToR, GCodeCannedReturnMode, GCodeCoolant, diff --git a/src/pygcode/transform.py b/src/pygcode/transform.py index 10a415b..da8a3c0 100644 --- a/src/pygcode/transform.py +++ b/src/pygcode/transform.py @@ -7,7 +7,7 @@ from .gcodes import GCodeAbsoluteDistanceMode, GCodeIncrementalDistanceMode from .gcodes import GCodeAbsoluteArcDistanceMode, GCodeIncrementalArcDistanceMode from .gcodes import GCodeCannedCycle from .gcodes import GCodeDrillingCyclePeck, GCodeDrillingCycleDwell, GCodeDrillingCycleChipBreaking -from .gcodes import GCodeCannedReturnMode, GCodeCannedCycleReturnLevel, GCodeCannedCycleReturnToR +from .gcodes import GCodeCannedReturnMode, GCodeCannedCycleReturnPrevLevel, GCodeCannedCycleReturnToR from .gcodes import _gcodes_abs2rel from .machine import Position @@ -381,7 +381,7 @@ def linearize_arc(arc_gcode, start_pos, plane=None, method_class=None, DEFAULT_SCC_PLANE = GCodeSelectXYPlane DEFAULT_SCC_DISTMODE = GCodeAbsoluteDistanceMode -DEFAULT_SCC_RETRACTMODE = GCodeCannedCycleReturnLevel +DEFAULT_SCC_RETRACTMODE = GCodeCannedCycleReturnPrevLevel def simplify_canned_cycle(canned_gcode, start_pos, plane=None, dist_mode=None, retract_mode=None,