bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu.

Browse Source
This commit is contained in:
daid303
2012-12-21 16:14:47 +01:00
parent b69cb9fbd9
commit 01aac2a142
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/ultralcd.cpp
View File

@ -137,8 +137,7 @@ static void lcd_status_screen()
currentMenu = lcd_main_menu;
lcd_quick_feedback();
}
if (abs(encoderPosition / 2) > 1)
feedmultiply += encoderPosition / 2;
feedmultiply += int(encoderPosition);
encoderPosition = 0;
if (feedmultiply < 10)
feedmultiply = 10;
@ -381,9 +380,9 @@ static void lcd_move_menu_axis()
MENU_ITEM(back, MSG_MOVE_AXIS, lcd_move_menu);
MENU_ITEM(submenu, "Move X", lcd_move_x);
MENU_ITEM(submenu, "Move Y", lcd_move_y);
MENU_ITEM(submenu, "Move Z", lcd_move_z);
if (move_menu_scale < 10.0)
{
MENU_ITEM(submenu, "Move Z", lcd_move_z);
MENU_ITEM(submenu, "Extruder", lcd_move_e);
}
END_MENU();
@ -698,6 +697,8 @@ void lcd_init()
WRITE(SDCARDDETECT, HIGH);
lcd_oldcardstatus = IS_SD_INSERTED;
#endif//(SDCARDDETECT > -1)
lcd_buttons_update();
encoderDiff = 0;
}
void lcd_update()