GitHub-Proxy/pygcode
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/petaflot/pygcode synced 2025-07-28 17:41:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

override G80 for prusa specific

Browse Source
This commit is contained in:
Emory Barlow 2022-05-03 23:49:02 -04:00
parent 77784025a5
commit 50b55dce77
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pygcode/__init__.py
View File

@ -54,7 +54,7 @@ __all__ = [
'GCodeArcMoveCW',
'GCodeBoringCycleDwellFeedOut',
'GCodeBoringCycleFeedOut',
'GCodeCancelCannedCycle',
#'GCodeCancelCannedCycle',
'GCodeCancelToolLengthOffset',
'GCodeCannedCycle',
'GCodeCannedCycleReturnPrevLevel',
@ -336,7 +336,7 @@ from .gcodes import (
GCodeArcMoveCW,
GCodeBoringCycleDwellFeedOut,
GCodeBoringCycleFeedOut,
GCodeCancelCannedCycle,
#GCodeCancelCannedCycle,
GCodeCancelToolLengthOffset,
GCodeCannedCycle,
GCodeCannedCycleReturnPrevLevel,

41
src/pygcode/gcodes.py
View File

@ -508,22 +508,24 @@ class GCodeRigidTapping(GCodeMotion):
param_letters = GCodeMotion.param_letters | set('K')
word_key = Word('G', 33.1)
class GCodeCancelCannedCycle(GCodeMotion):
"""G80: Cancel Canned Cycle"""
word_key = Word('G', 80)
# Modal Group
# Technically G80 belongs to the motion modal group, however it's often
# expressed in the same line as another motion command.
# This is alowed, but executed just prior to any other motion command
# eg: G00 G80
# will leave the machine in rapid motion mode
# Just running G80 will leave machine with no motion mode.
modal_group = None
exec_order = 241
def _process(self, machine):
machine.mode.motion = None
#
# Conflicts with prusa command
#
#class GCodeCancelCannedCycle(GCodeMotion):
# """G80: Cancel Canned Cycle"""
# word_key = Word('G', 80)
# # Modal Group
# # Technically G80 belongs to the motion modal group, however it's often
# # expressed in the same line as another motion command.
# # This is alowed, but executed just prior to any other motion command
# # eg: G00 G80
# # will leave the machine in rapid motion mode
# # Just running G80 will leave machine with no motion mode.
# modal_group = None
# exec_order = 241
#
# def _process(self, machine):
# machine.mode.motion = None
# ======================= Canned Cycles =======================
@ -1375,6 +1377,7 @@ class GCodeUserDefined(GCodeNonModal):
# M204 S T Acceleration settings
# M221 S T Set extrude factor override percentage
# M106 S Set fan speed
# G80 N R V L R F B Mesh-based Z probe
class GCodePrintChecking(GCode):
exec_order = 999
@ -1461,6 +1464,12 @@ class GCodeSetFanSpeed(GCode):
param_letters = set('S')
word_key = Word('M', 106)
class GCodeMeshBasedZProbe(GCode):
exec_order = 999
modal_group = MODAL_GROUP_MAP['user_defined']
param_letters = set('NRVLRFB')
word_key = Word('G', 80)
# ======================= Utilities =======================
def _subclasses_level(root_class, recursion_level=0):