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

Testing slider bug fix

Browse source
This commit is contained in:
make-ing 2016-01-15 11:53:27 +01:00
parent 5c8d491fb8
commit aa7a781c92
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -673,10 +673,10 @@ class MachineCom(object):
obj = self._regex_feedrate.search(cmd) obj = self._regex_feedrate.search(cmd)
if obj is not None: if obj is not None:
feedrate_cmd = cmd[obj.start():obj.end()] feedrate_cmd = cmd[obj.start():obj.end()]
self._actual_feedrate = int(feedrate_cmd[1:])
if feedrate_cmd in self._feedrate_dict: if feedrate_cmd in self._feedrate_dict:
new_feedrate = self._feedrate_dict[feedrate_cmd] new_feedrate = self._feedrate_dict[feedrate_cmd]
else: else:
self._actual_feedrate = int(feedrate_cmd[1:])
new_feedrate = round(self._actual_feedrate * self._feedrate_factor) new_feedrate = round(self._actual_feedrate * self._feedrate_factor)
# TODO replace with value from printer profile # TODO replace with value from printer profile
if new_feedrate > 5000: if new_feedrate > 5000:
@ -694,10 +694,10 @@ class MachineCom(object):
obj = self._regex_intensity.search(cmd) obj = self._regex_intensity.search(cmd)
if obj is not None: if obj is not None:
intensity_cmd = cmd[obj.start():obj.end()] intensity_cmd = cmd[obj.start():obj.end()]
self._actual_intensity = int(intensity_cmd[1:])
if intensity_cmd in self._intensity_dict: if intensity_cmd in self._intensity_dict:
new_intensity = self._intensity_dict[intensity_cmd] new_intensity = self._intensity_dict[intensity_cmd]
else: else:
self._actual_intensity = int(intensity_cmd[1:])
new_intensity = round(self._actual_intensity * self._intensity_factor) new_intensity = round(self._actual_intensity * self._intensity_factor)
if new_intensity > 1000: if new_intensity > 1000:
new_intensity = 1000 new_intensity = 1000