From aaef7c6b89255f9440b9b0b21636766c79479437 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 2 Sep 2016 01:42:38 -0500 Subject: [PATCH 1/2] Fix a misspelling of minimum --- Marlin/Configuration.h | 2 +- Marlin/example_configurations/Cartesio/Configuration.h | 2 +- Marlin/example_configurations/Felix/Configuration.h | 2 +- Marlin/example_configurations/Felix/DUAL/Configuration.h | 2 +- Marlin/example_configurations/Hephestos/Configuration.h | 2 +- Marlin/example_configurations/Hephestos_2/Configuration.h | 2 +- Marlin/example_configurations/K8200/Configuration.h | 2 +- Marlin/example_configurations/K8400/Configuration.h | 2 +- Marlin/example_configurations/K8400/Dual-head/Configuration.h | 2 +- .../RepRapWorld/Megatronics/Configuration.h | 2 +- Marlin/example_configurations/RigidBot/Configuration.h | 2 +- Marlin/example_configurations/SCARA/Configuration.h | 2 +- Marlin/example_configurations/TAZ4/Configuration.h | 2 +- Marlin/example_configurations/WITBOX/Configuration.h | 2 +- Marlin/example_configurations/adafruit/ST7565/Configuration.h | 2 +- Marlin/example_configurations/delta/biv2.5/Configuration.h | 2 +- Marlin/example_configurations/delta/generic/Configuration.h | 2 +- Marlin/example_configurations/delta/kossel_mini/Configuration.h | 2 +- Marlin/example_configurations/delta/kossel_pro/Configuration.h | 2 +- Marlin/example_configurations/delta/kossel_xl/Configuration.h | 2 +- Marlin/example_configurations/makibox/Configuration.h | 2 +- Marlin/example_configurations/tvrrug/Round2/Configuration.h | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 62aa501d2e..9dadb9eaaa 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -444,7 +444,7 @@ #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 20.0 // (mm/sec) diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h index fe7c3c1eda..48b0fbff80 100644 --- a/Marlin/example_configurations/Cartesio/Configuration.h +++ b/Marlin/example_configurations/Cartesio/Configuration.h @@ -444,7 +444,7 @@ #define DEFAULT_RETRACT_ACCELERATION 10000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 10.0 // (mm/sec) diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index a222fc8454..39976752fd 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -427,7 +427,7 @@ #define DEFAULT_RETRACT_ACCELERATION 5000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 10.0 // (mm/sec) diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index 863ae7b058..5862f355c9 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -425,7 +425,7 @@ #define DEFAULT_RETRACT_ACCELERATION 5000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 10.0 // (mm/sec) diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index d82938ea3d..c9bd55e343 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -436,7 +436,7 @@ #define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 10.0 // (mm/sec) diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index 71ecca05fd..412cf24cfe 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -438,7 +438,7 @@ #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 20.0 // (mm/sec) diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 598658281a..4aacf0cbc7 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -461,7 +461,7 @@ #define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 20.0 // (mm/sec) diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h index aa31de82e3..925e65d128 100644 --- a/Marlin/example_configurations/K8400/Configuration.h +++ b/Marlin/example_configurations/K8400/Configuration.h @@ -444,7 +444,7 @@ #define DEFAULT_RETRACT_ACCELERATION 6000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 10.0 // (mm/sec) diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h index 98d2877991..7ae51f4be7 100644 --- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h +++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h @@ -444,7 +444,7 @@ #define DEFAULT_RETRACT_ACCELERATION 6000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 10.0 // (mm/sec) diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index 81562afc55..850d50cd29 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -444,7 +444,7 @@ #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 20.0 // (mm/sec) diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index d312769232..335fc61a8c 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -442,7 +442,7 @@ #define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 8.0 // (mm/sec) diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index d2313a2468..a709f5d468 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -452,7 +452,7 @@ #define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 5.0 // (mm/sec) diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index b10b542fc9..97c7816302 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -465,7 +465,7 @@ #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 8.0 // (mm/sec) diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index f228d3b249..b8e600c15c 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -436,7 +436,7 @@ #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 10.0 // (mm/sec) diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 17fea4b863..6a88346581 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -444,7 +444,7 @@ #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 20.0 // (mm/sec) diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index e73f405f1b..e37d2d2ed8 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -487,7 +487,7 @@ #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 15.0 // (mm/sec) diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 1192234c21..09c52df42d 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -487,7 +487,7 @@ #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 20.0 // (mm/sec) diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 864f58f03a..1b17850ddc 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -487,7 +487,7 @@ #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 20.0 // (mm/sec) diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 7f1e4443a4..34a3181b79 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -483,7 +483,7 @@ #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 20.0 // (mm/sec) diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index 075c800324..2794567312 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -493,7 +493,7 @@ #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 20.0 // (mm/sec) diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index eb29895066..1c49c60d00 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -447,7 +447,7 @@ #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 20.0 // (mm/sec) diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index dc6f809ed1..1767467985 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -438,7 +438,7 @@ #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration in mm/s^2 for retracts #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves -// "Jerk" specifies the minumum speed change that requires acceleration. +// "Jerk" specifies the minimum speed change that requires acceleration. // When changing speed and direction, if the difference is less than the // value set here, it may happen instantaneously. #define DEFAULT_XYJERK 20.0 // (mm/sec) From d07a913f211545f086bc1cb1e166dd53b0aab789 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 2 Sep 2016 02:06:17 -0500 Subject: [PATCH 2/2] Tweak to stepper advance e_steps update --- Marlin/stepper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp index 51459602f0..364e66d1b6 100644 --- a/Marlin/stepper.cpp +++ b/Marlin/stepper.cpp @@ -426,7 +426,7 @@ void Stepper::isr() { counter_E -= current_block->step_event_count; #if DISABLED(MIXING_EXTRUDER) // Don't step E here for mixing extruder - e_steps[TOOL_E_INDEX] += motor_direction(E_AXIS) ? -1 : 1; + motor_direction(E_AXIS) ? --e_steps[TOOL_E_INDEX] : ++e_steps[TOOL_E_INDEX]; #endif }