SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4749 from thinkyhead/rc_minumum_minimum

Browse source 
Fix a misspelling of minimum
This commit is contained in:
Scott Lahteine 2016-09-02 04:41:00 -05:00 committed by GitHub
parent ad659b5f91 d07a913f21
commit dad94d2fef
23 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/Cartesio/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/Felix/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/Felix/DUAL/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/Hephestos/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/Hephestos_2/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/K8200/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/K8400/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/K8400/Dual-head/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/RigidBot/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/SCARA/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/TAZ4/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/WITBOX/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/adafruit/ST7565/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/delta/biv2.5/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/delta/generic/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/makibox/Configuration.h
View file

@ -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)

2
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View file

@ -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)

2
Marlin/stepper.cpp
View file

@ -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
}