From 840289e7ccaa79846acfdceee63ffc1baa77168c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 6 Dec 2017 12:44:44 -0600
Subject: [PATCH] Use block cleaning instead of split flag
---
Marlin/src/module/motion.cpp | 2 --
Marlin/src/module/planner.cpp | 4 +---
Marlin/src/module/planner.h | 1 -
Marlin/src/module/stepper.cpp | 1 +
4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 503a0e97c9..8ed841be3a 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -426,13 +426,11 @@ void bracket_probe_move(const bool before) {
saved_feedrate_percentage = feedrate_percentage;
feedrate_percentage = 100;
gcode.refresh_cmd_timeout();
- planner.split_first_move = false;
}
else {
feedrate_mm_s = saved_feedrate_mm_s;
feedrate_percentage = saved_feedrate_percentage;
gcode.refresh_cmd_timeout();
- planner.split_first_move = true;
}
}
diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp
index 64f11a8e02..fc2dd2acd1 100644
--- a/Marlin/src/module/planner.cpp
+++ b/Marlin/src/module/planner.cpp
@@ -103,8 +103,6 @@ float Planner::max_feedrate_mm_s[XYZE_N], // Max speeds in mm per second
uint8_t Planner::last_extruder = 0; // Respond to extruder change
#endif
-bool Planner::split_first_move = true;
-
int16_t Planner::flow_percentage[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(100); // Extrusion factor for each extruder
float Planner::e_factor[EXTRUDERS], // The flow percentage and volumetric multiplier combine to scale E movement
@@ -1452,7 +1450,7 @@ void Planner::_buffer_line(const float &a, const float &b, const float &c, const
position[E_AXIS] = target[E_AXIS];
// Always split the first move into two (if not homing or probing)
- if (!blocks_queued() && split_first_move) {
+ if (!blocks_queued()) {
#define _BETWEEN(A) (position[A##_AXIS] + target[A##_AXIS]) >> 1
const int32_t between[XYZE] = { _BETWEEN(X), _BETWEEN(Y), _BETWEEN(Z), _BETWEEN(E) };
DISABLE_STEPPER_DRIVER_INTERRUPT();
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index ce0a89cd11..314d6daa04 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -165,7 +165,6 @@ class Planner {
travel_acceleration, // Travel acceleration mm/s^2 DEFAULT ACCELERATION for all NON printing moves. M204 MXXXX
max_jerk[XYZE], // The largest speed change requiring no acceleration
min_travel_feedrate_mm_s;
- static bool split_first_move;
#if HAS_LEVELING
static bool leveling_active; // Flag that bed leveling is enabled
diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp
index 9a464f1cfd..b39fdf6a5f 100644
--- a/Marlin/src/module/stepper.cpp
+++ b/Marlin/src/module/stepper.cpp
@@ -1250,6 +1250,7 @@ void Stepper::endstop_triggered(AxisEnum axis) {
#endif // !COREXY && !COREXZ && !COREYZ
kill_current_block();
+ cleaning_buffer_counter = -(BLOCK_BUFFER_SIZE - 1); // Ignore remaining blocks
}
void Stepper::report_positions() {