bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Revert "Merge pull request #8611 from thinkyhead/bf2_planner_split_first"

Browse Source 
This reverts commit 824980e70e, reversing
changes made to aa7efb96bf.
This commit is contained in:
Scott Lahteine
2017-12-03 16:52:48 -06:00
parent fb44f8e50f
commit dd8febca1a
2 changed files with 64 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/src/module/planner.h
View File

@ -144,7 +144,7 @@ class Planner {
static uint8_t last_extruder; // Respond to extruder change
#endif
static int16_t flow_percentage[EXTRUDERS]; // Extrusion factor for each extruder
static int16_t flow_percentage[EXTRUDERS]; // Extrusion factor for each extruder
static float e_factor[EXTRUDERS], // The flow percentage and volumetric multiplier combine to scale E movement
filament_size[EXTRUDERS], // diameter of filament (in millimeters), typically around 1.75 or 2.85, 0 disables the volumetric calculations for the extruder
@ -352,17 +352,6 @@ class Planner {
#endif
/**
* Planner::_buffer_steps
*
* Add a new linear movement to the buffer (in terms of steps).
*
* target - target position in steps units
* fr_mm_s - (target) speed of the move
* extruder - target extruder
*/
static void _buffer_steps(const int32_t target[XYZE], float fr_mm_s, const uint8_t extruder);
/**
* Planner::_buffer_line
*
@ -374,7 +363,7 @@ class Planner {
* fr_mm_s - (target) speed of the move
* extruder - target extruder
*/
static void _buffer_line(const float &a, const float &b, const float &c, const float &e, const float &fr_mm_s, const uint8_t extruder);
static void _buffer_line(const float &a, const float &b, const float &c, const float &e, float fr_mm_s, const uint8_t extruder);
static void _set_position_mm(const float &a, const float &b, const float &c, const float &e);