MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Lightly optimize arc length calculation

Browse Source
This commit is contained in:
Scott Lahteine 2018-01-23 16:18:54 -06:00
parent 87c254b238
commit d4ab383a1b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/Marlin_main.cpp
View File

@ -12880,7 +12880,8 @@ void prepare_move_to_destination() {
if (angular_travel == 0 && current_position[p_axis] == cart[p_axis] && current_position[q_axis] == cart[q_axis]) if (angular_travel == 0 && current_position[p_axis] == cart[p_axis] && current_position[q_axis] == cart[q_axis])
angular_travel = RADIANS(360); angular_travel = RADIANS(360);
const float mm_of_travel = HYPOT(angular_travel * radius, FABS(linear_travel)); const float flat_mm = radius * angular_travel,
mm_of_travel = linear_travel ? HYPOT(flat_mm, linear_travel) : flat_mm;
if (mm_of_travel < 0.001) return; if (mm_of_travel < 0.001) return;
uint16_t segments = FLOOR(mm_of_travel / (MM_PER_ARC_SEGMENT)); uint16_t segments = FLOOR(mm_of_travel / (MM_PER_ARC_SEGMENT));

3
Marlin/planner.cpp
View File

@ -362,7 +362,7 @@ void Planner::recalculate_trapezoids() {
} }
} }
/* /**
* Recalculate the motion plan according to the following algorithm: * Recalculate the motion plan according to the following algorithm:
* *
* 1. Go over every block in reverse order... * 1. Go over every block in reverse order...
@ -392,7 +392,6 @@ void Planner::recalculate() {
recalculate_trapezoids(); recalculate_trapezoids();
} }
#if ENABLED(AUTOTEMP) #if ENABLED(AUTOTEMP)
void Planner::getHighESpeed() { void Planner::getHighESpeed() {