Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a misspelling of minimum #4749

Merged
merged 2 commits into from
Sep 2, 2016
Merged

Fix a misspelling of minimum #4749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaef7c6
Fix a misspelling of minimum
thinkyhead Sep 2, 2016
d07a913
Tweak to stepper advance e_steps update
thinkyhead Sep 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/Cartesio/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/Felix/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/Felix/DUAL/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/Hephestos/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/Hephestos_2/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/K8200/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/K8400/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/K8400/Dual-head/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/RigidBot/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/SCARA/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/TAZ4/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/WITBOX/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/adafruit/ST7565/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/delta/biv2.5/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/delta/generic/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/delta/kossel_mini/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/delta/kossel_pro/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/delta/kossel_xl/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/makibox/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/tvrrug/Round2/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/stepper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down