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

fixed wrong dictionary entry bug if limits are exceeded

Browse source
This commit is contained in:
make-ing 2015-11-13 19:11:13 +01:00
parent ced9688647
commit 19f2ec9824
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -674,12 +674,12 @@ class MachineCom(object):
else:
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
elif new_feedrate < 30:
new_feedrate = 30
self._feedrate_dict[feedrate_cmd] = new_feedrate
# TODO replace with value from printer profile
if new_feedrate > 5000:
new_feedrate = 5000
elif new_feedrate < 30:
new_feedrate = 30
else:
return cmd
return cmd.replace(feedrate_cmd, 'F%d' % round(new_feedrate))
@ -695,9 +695,9 @@ class MachineCom(object):
else:
self._actual_intensity = int(intensity_cmd[1:])
new_intensity = round(self._actual_intensity * self._intensity_factor)
if new_intensity > 1000:
new_intensity = 1000
self._intensity_dict[intensity_cmd] = new_intensity
if new_intensity > 1000:
new_intensity = 1000
else:
return cmd
return cmd.replace(intensity_cmd, 'S%d' % round(new_intensity))