pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added functionality to unlock the GUI when grbl is also unlocked with "$x" command

Browse source
This commit is contained in:
make-ing 2016-06-02 14:43:20 +02:00
parent 3128ac7765
commit 2c416eafc2
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/octoprint/util/comm_acc2.py
View file

@ -88,7 +88,7 @@ class MachineCom(object):
self._finished_passes = 0 self._finished_passes = 0
# regular expressions # regular expressions
self._regex_command = re.compile("^\s*\$?([GM]\d+|[TH])") self._regex_command = re.compile("^\s*\$?([GM]\d+|[THX])")
self._regex_feedrate = re.compile("F\d+", re.IGNORECASE) self._regex_feedrate = re.compile("F\d+", re.IGNORECASE)
self._regex_intensity = re.compile("S\d+", re.IGNORECASE) self._regex_intensity = re.compile("S\d+", re.IGNORECASE)
@ -755,6 +755,10 @@ class MachineCom(object):
self._changeState(self.STATE_HOMING) self._changeState(self.STATE_HOMING)
return cmd return cmd
def _gcode_X_sent(self, cmd, cmd_type=None):
self._changeState(self.STATE_HOMING) # TODO: maybe change to seperate $X mode
return cmd
def _gcode_Hold_sent(self, cmd, cmd_type=None): def _gcode_Hold_sent(self, cmd, cmd_type=None):
self._changeState(self.STATE_PAUSED) self._changeState(self.STATE_PAUSED)
return cmd return cmd