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

skipping feedrate and intensity replacement if factor is 1

Browse source
This commit is contained in:
make-ing 2015-11-13 14:45:09 +01:00
parent 4e7087077d
commit 5ac5b77eeb
1 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -661,29 +661,33 @@ class MachineCom(object):
self.sendCommand('S%d' % temp)
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:])
new_feedrate = round(self._actual_feedrate * self._feedrate_factor)
# TODO replace with value from printer profile
if new_feedrate > 5000:
new_feedrate = 5000
else:
return cmd
return cmd.replace(feedrate_cmd, 'F%d' % new_feedrate)
if self._feedrate_factor != 1:
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:])
new_feedrate = round(self._actual_feedrate * self._feedrate_factor)
# TODO replace with value from printer profile
if new_feedrate > 5000:
new_feedrate = 5000
else:
return cmd
return cmd.replace(feedrate_cmd, 'F%d' % new_feedrate)
return cmd
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:])
new_intensity = round(self._actual_intensity * self._intensity_factor)
if new_intensity > 1000:
new_intensity = 1000
else:
return cmd
return cmd.replace(intensity_cmd, 'S%d' % new_intensity)
if self._intensity_factor != 1:
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:])
new_intensity = round(self._actual_intensity * self._intensity_factor)
if new_intensity > 1000:
new_intensity = 1000
else:
return cmd
return cmd.replace(intensity_cmd, 'S%d' % new_intensity)
return cmd
##~~ command handlers
def _gcode_G1_sending(self, cmd, cmd_type=None):