From 10428b30d9184b1b0bd52e475d7df545175c73d7 Mon Sep 17 00:00:00 2001
From: Marek Bel <marek.bel@posta.cz>
Date: Mon, 24 Sep 2018 16:01:58 +0200
Subject: [PATCH] Use cs.mintravelfeedrate from ConfigurationStore.
---
Firmware/ConfigurationStore.cpp | 4 ++--
Firmware/Marlin_main.cpp | 2 +-
Firmware/planner.cpp | 3 +--
Firmware/planner.h | 1 -
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Firmware/ConfigurationStore.cpp b/Firmware/ConfigurationStore.cpp
index 1ff4203d..cb0c6ac2 100644
--- a/Firmware/ConfigurationStore.cpp
+++ b/Firmware/ConfigurationStore.cpp
@@ -103,7 +103,7 @@ void Config_PrintSettings(uint8_t level)
echomagic, echomagic, cs.max_acceleration_units_per_sq_second_normal[X_AXIS], cs.max_acceleration_units_per_sq_second_normal[Y_AXIS], cs.max_acceleration_units_per_sq_second_normal[Z_AXIS], cs.max_acceleration_units_per_sq_second_normal[E_AXIS],
echomagic, echomagic, max_acceleration_units_per_sq_second_silent[X_AXIS], max_acceleration_units_per_sq_second_silent[Y_AXIS], max_acceleration_units_per_sq_second_silent[Z_AXIS], max_acceleration_units_per_sq_second_silent[E_AXIS],
echomagic, echomagic, cs.acceleration, cs.retract_acceleration,
- echomagic, echomagic, cs.minimumfeedrate, mintravelfeedrate, minsegmenttime, max_jerk[X_AXIS], max_jerk[Y_AXIS], max_jerk[Z_AXIS], max_jerk[E_AXIS],
+ echomagic, echomagic, cs.minimumfeedrate, cs.mintravelfeedrate, minsegmenttime, max_jerk[X_AXIS], max_jerk[Y_AXIS], max_jerk[Z_AXIS], max_jerk[E_AXIS],
echomagic, echomagic, add_homing[X_AXIS], add_homing[Y_AXIS], add_homing[Z_AXIS]
#else //TMC2130
printf_P(PSTR(
@@ -118,7 +118,7 @@ void Config_PrintSettings(uint8_t level)
echomagic, echomagic, max_feedrate[X_AXIS], max_feedrate[Y_AXIS], max_feedrate[Z_AXIS], max_feedrate[E_AXIS],
echomagic, echomagic, max_acceleration_units_per_sq_second[X_AXIS], max_acceleration_units_per_sq_second[Y_AXIS], max_acceleration_units_per_sq_second[Z_AXIS], max_acceleration_units_per_sq_second[E_AXIS],
echomagic, echomagic, cs.acceleration, cs.retract_acceleration,
- echomagic, echomagic, cs.minimumfeedrate, mintravelfeedrate, minsegmenttime, max_jerk[X_AXIS], max_jerk[Y_AXIS], max_jerk[Z_AXIS], max_jerk[E_AXIS],
+ echomagic, echomagic, cs.minimumfeedrate, cs.mintravelfeedrate, minsegmenttime, max_jerk[X_AXIS], max_jerk[Y_AXIS], max_jerk[Z_AXIS], max_jerk[E_AXIS],
echomagic, echomagic, add_homing[X_AXIS], add_homing[Y_AXIS], add_homing[Z_AXIS]
#endif //TMC2130
);
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 6a0023f4..ee8a9258 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -5962,7 +5962,7 @@ Sigma_Exit:
case 205: //M205 advanced settings: minimum travel speed S=while printing T=travel only, B=minimum segment time X= maximum xy jerk, Z=maximum Z jerk
{
if(code_seen('S')) cs.minimumfeedrate = code_value();
- if(code_seen('T')) mintravelfeedrate = code_value();
+ if(code_seen('T')) cs.mintravelfeedrate = code_value();
if(code_seen('B')) minsegmenttime = code_value() ;
if(code_seen('X')) max_jerk[X_AXIS] = max_jerk[Y_AXIS] = code_value();
if(code_seen('Y')) max_jerk[Y_AXIS] = code_value();
diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp
index 1e141fa7..fc843688 100644
--- a/Firmware/planner.cpp
+++ b/Firmware/planner.cpp
@@ -85,7 +85,6 @@ unsigned long* max_acceleration_units_per_sq_second = cs.max_acceleration_units_
// Jerk is a maximum immediate velocity change.
float max_jerk[NUM_AXIS];
-float mintravelfeedrate;
unsigned long axis_steps_per_sqr_second[NUM_AXIS];
#ifdef ENABLE_AUTO_BED_LEVELING
@@ -909,7 +908,7 @@ block->steps_y.wide = labs((target[X_AXIS]-position[X_AXIS]) - (target[Y_AXIS]-p
if (block->steps_e.wide == 0)
{
- if(feed_rate<mintravelfeedrate) feed_rate=mintravelfeedrate;
+ if(feed_rate<cs.mintravelfeedrate) feed_rate=cs.mintravelfeedrate;
}
else
{
diff --git a/Firmware/planner.h b/Firmware/planner.h
index a7de978b..98bc3b34 100644
--- a/Firmware/planner.h
+++ b/Firmware/planner.h
@@ -171,7 +171,6 @@ extern unsigned long* max_acceleration_units_per_sq_second;
// Jerk is a maximum immediate velocity change.
extern float max_jerk[NUM_AXIS];
-extern float mintravelfeedrate;
extern unsigned long axis_steps_per_sqr_second[NUM_AXIS];
extern long position[NUM_AXIS];