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

Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam

Browse source
This commit is contained in:
Teja 2015-11-09 12:16:15 +01:00
commit 239aee0c80
1 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,9 +78,13 @@ class MachineCom(object):
self._send_event = CountedEvent(max=50)
self._finished_currentFile = False
self._pause_delay_time = 0
self._feedrate_factor = 1
self._intensity_factor = 1
# regular expressions
self._regex_command = re.compile("^\s*\$?([GM]\d+|[TH])")
self._regex_feedrate = re.compile("F\d+", re.IGNORECASE)
self._regex_intensity = re.compile("S\d+", re.IGNORECASE)
self._real_time_commands={'poll_status':False,
'feed_hold':False,
@ -195,6 +199,7 @@ class MachineCom(object):
self._log("Send: %s" % self._cmd)
self._acc_line_buffer.append(self._cmd + '\n')
try:
self._cmd = self._process_command_phase("sending", self._cmd)
self._serial.write(self._cmd + '\n')
#self._metric_chars += len(self._cmd) + 1
#if self._metric_time is None:
@ -209,6 +214,7 @@ class MachineCom(object):
else:
self._log("Send: %s" % cmd)
try:
self._process_command_phase("sending", self._cmd)
self._serial.write(cmd)
#self._metric_chars += len(cmd)
#if self._metric_time is None:
@ -637,7 +643,40 @@ class MachineCom(object):
gcode = self._gcode_command_for_cmd(command)
return command, command_type, gcode
def _replace_feedrate(self, cmd):
obj = self._regex_feedrate.search(cmd)
if obj is not None:
feedrate_cmd = cmd[obj.start():obj.end()]
self._actual_feedrate = int(feedrate_cmd[1:]) * self._feedrate_factor
else:
return cmd
return cmd.replace(feedrate_cmd, 'F'+str(self._actual_feedrate))
def _replace_intensity(self, cmd):
obj = self._regex_intensity.search(cmd)
if obj is not None:
intensity_cmd = cmd[obj.start():obj.end()]
self._actual_intensity = int(intensity_cmd[1:]) * self._intensity_factor
else:
return cmd
return cmd.replace(intensity_cmd, 'F'+str(self._actual_intensity))
##~~ command handlers
def _gcode_G1_sending(self, cmd, cmd_type=None):
cmd = self._replace_feedrate(cmd)
cmd = self._replace_intensity(cmd)
return cmd
def _gcode_G2_sending(self, cmd, cmd_type=None):
cmd = self._replace_feedrate(cmd)
cmd = self._replace_intensity(cmd)
return cmd
def _gcode_G3_sending(self, cmd, cmd_type=None):
cmd = self._replace_feedrate(cmd)
cmd = self._replace_intensity(cmd)
return cmd
def _gcode_H_sent(self, cmd, cmd_type=None):
self._changeState(self.STATE_HOMING)
return cmd