GitHub-Proxy/pygcode
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/petaflot/pygcode synced 2025-08-16 19:35:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

in progress commit on gcodes and machine

Browse Source 
- trying to get G80 to drop back into G0 or previous mvmt
This commit is contained in:
Walker Inman 2019-07-26 07:46:58 -04:00
parent cc75fc9df9
commit 37a36ae2d5
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pygcode/gcodes.py
View File

@ -522,7 +522,7 @@ class GCodeCancelCannedCycle(GCodeMotion):
modal_group = None modal_group = None
exec_order = 241 exec_order = 241
def _process(self, machine): def WRONG_process(self, machine):
machine.mode.motion = None machine.mode.motion = None

7
src/pygcode/machine.py
View File

@ -1,6 +1,9 @@
import re import re
from copy import copy, deepcopy from copy import copy, deepcopy
from collections import defaultdict from collections import defaultdict
import logging
log = logging.getLogger(__name__)
from .gcodes import ( from .gcodes import (
MODAL_GROUP_MAP, GCode, MODAL_GROUP_MAP, GCode,
@ -407,6 +410,10 @@ class Machine(object):
self.state.cur_coord_sys = coord_sys_mode.coord_system_id self.state.cur_coord_sys = coord_sys_mode.coord_system_id
# TODO: convert coord systems between inches/mm, G20/G21 respectively # TODO: convert coord systems between inches/mm, G20/G21 respectively
# NOTE : on at least a Haas -- this cannot be changed when running a
# program -- the G20 / G21 codes don't actually change units, but if
# a G20 / G21 appears in the code and the machine settings do not match
# an error will be thrown.
def modal_gcode(self, modal_params): def modal_gcode(self, modal_params):
""" """