3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #714 from mkbel/hot_fix_move_axis

Browse Source 
Hot fix: Can not move X and Y axis in stealth mode, when the printer …
This commit is contained in:
PavelSindler 2018-05-03 13:42:54 +02:00 committed by GitHub
commit d39343f92d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Firmware/ultralcd.cpp
View File

@ -114,6 +114,11 @@ union MenuData
//Timer timer; //Timer timer;
char dummy; char dummy;
} autoLoadFilamentMenu; } autoLoadFilamentMenu;
struct _Lcd_moveMenu
{
bool initialized;
bool endstopsEnabledPrevious;
} _lcd_moveMenu;
}; };
// State of the currently active menu. // State of the currently active menu.
@ -2236,6 +2241,12 @@ void lcd_menu_statistics()
static void _lcd_move(const char *name, int axis, int min, int max) { static void _lcd_move(const char *name, int axis, int min, int max) {
if (!menuData._lcd_moveMenu.initialized)
{
menuData._lcd_moveMenu.endstopsEnabledPrevious = enable_endstops(false);
menuData._lcd_moveMenu.initialized = true;
}
if (encoderPosition != 0) { if (encoderPosition != 0) {
refresh_cmd_timeout(); refresh_cmd_timeout();
if (! planner_queue_full()) { if (! planner_queue_full()) {
@ -2249,8 +2260,8 @@ static void _lcd_move(const char *name, int axis, int min, int max) {
} }
} }
if (lcdDrawUpdate) lcd_implementation_drawedit(name, ftostr31(current_position[axis])); if (lcdDrawUpdate) lcd_implementation_drawedit(name, ftostr31(current_position[axis]));
if (LCD_CLICKED) menu_action_back(); { if (menuExiting || LCD_CLICKED) (void)enable_endstops(menuData._lcd_moveMenu.endstopsEnabledPrevious);
} if (LCD_CLICKED) menu_action_back();
} }