0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #5057 from thinkyhead/rc_mbl_lcd_logical

Browse source 
Fix manual leveling coordinates
This commit is contained in:
Scott Lahteine 2016-10-22 06:31:02 -05:00 committed by GitHub
parent dbfabb4c0a 14e60f0d3b
commit 0908329d96
23 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Configuration.h
View file

@ -492,7 +492,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -492,7 +492,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -475,7 +475,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -475,7 +475,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -484,7 +484,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -486,7 +486,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -509,7 +509,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -492,7 +492,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -492,7 +492,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -492,7 +492,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -490,7 +490,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -507,7 +507,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -513,7 +513,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -484,7 +484,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -492,7 +492,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -537,7 +537,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -537,7 +537,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -537,7 +537,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -533,7 +533,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -543,7 +543,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -495,7 +495,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

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

@ -488,7 +488,7 @@
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
/**
* Defult Jerk (mm/s)
* Default Jerk (mm/s)
*
* "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the

8
Marlin/ultralcd.cpp
View file

@ -1038,13 +1038,13 @@ void kill_screen(const char* lcd_msg) {
// Note: During Manual Bed Leveling the homed Z position is MESH_HOME_SEARCH_Z
// Z position will be restored with the final action, a G28
inline void _mbl_goto_xy(float x, float y) {
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z + Z_HOMING_HEIGHT;
current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z + Z_HOMING_HEIGHT);
line_to_current(Z_AXIS);
current_position[X_AXIS] = x + home_offset[X_AXIS];
current_position[Y_AXIS] = y + home_offset[Y_AXIS];
current_position[X_AXIS] = LOGICAL_X_POSITION(x);
current_position[Y_AXIS] = LOGICAL_Y_POSITION(y);
line_to_current(manual_feedrate_mm_m[X_AXIS] <= manual_feedrate_mm_m[Y_AXIS] ? X_AXIS : Y_AXIS);
#if Z_HOMING_HEIGHT > 0
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z; // How do condition and action match?
current_position[Z_AXIS] = LOGICAL_Z_POSITION(MESH_HOME_SEARCH_Z);
line_to_current(Z_AXIS);
#endif
stepper.synchronize();