GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 19:09:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix reading F parameter from g-code

Browse Source 
We need to divide that by 60 to get into somewhat more sane units than the stupid mm/min that g-code uses.
Also simplifies a few other things there.

Contributes to issue CURA-5561.
This commit is contained in:
Ghostkeeper 2018-09-05 17:09:00 +02:00
parent 23e42164cb
commit bec643cd79
No known key found for this signature in database
GPG Key ID: 5252B696FB5E7C7A
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
50_inst_per_sec.py
View File

@ -28,7 +28,7 @@ MACHINE_MAX_ACCELERATION_E = 10000
MACHINE_MAX_JERK_XY = 20
MACHINE_MAX_JERK_Z = 0.4
MACHINE_MAX_JERK_E = 5
MACHINE_MINIMUM_FEEDRATE = 0
MACHINE_MINIMUM_FEEDRATE = 0.001
MACHINE_ACCELERATION = 3000
## Gets the code and number from the given g-code line.
@ -217,7 +217,9 @@ class Command:
new_position[1] = float(value_dict.get("Y", new_position[1]))
new_position[2] = float(value_dict.get("Z", new_position[2]))
new_position[3] = float(value_dict.get("E", new_position[3]))
buf.current_feedrate = value_dict.get("F", buf.current_feedrate)
buf.current_feedrate = float(value_dict.get("F", buf.current_feedrate * 60.0)) / 60.0
if buf.current_feedrate < MACHINE_MINIMUM_FEEDRATE:
buf.current_feedrate = MACHINE_MINIMUM_FEEDRATE
self._delta = [
new_position[0] - buf.current_position[0],
@ -228,15 +230,12 @@ class Command:
self._abs_delta = [abs(x) for x in self._delta]
self._max_travel = max(self._abs_delta)
if self._max_travel > 0:
feedrate = float(value_dict.get("F", buf.current_feedrate))
if feedrate < MACHINE_MINIMUM_FEEDRATE:
feedrate = MACHINE_MINIMUM_FEEDRATE
self._nominal_feedrate = feedrate
self._nominal_feedrate = buf.current_feedrate
self._distance = math.sqrt(self._abs_delta[0] ** 2 + self._abs_delta[1] ** 2 + self._abs_delta[2] ** 2)
if self._distance == 0:
self._distance = self._abs_delta[3]
current_feedrate = [d * feedrate / self._distance for d in self._delta]
current_feedrate = [d * self._nominal_feedrate / self._distance for d in self._delta]
current_abs_feedrate = [abs(f) for f in current_feedrate]
feedrate_factor = min(1.0, MACHINE_MAX_FEEDRATE_X)
feedrate_factor = min(feedrate_factor, MACHINE_MAX_FEEDRATE_Y)