|
@@ -137,8 +137,7 @@ static void lcd_status_screen()
|
137
|
137
|
currentMenu = lcd_main_menu;
|
138
|
138
|
lcd_quick_feedback();
|
139
|
139
|
}
|
140
|
|
- if (abs(encoderPosition / 2) > 1)
|
141
|
|
- feedmultiply += encoderPosition / 2;
|
|
140
|
+ feedmultiply += int(encoderPosition);
|
142
|
141
|
encoderPosition = 0;
|
143
|
142
|
if (feedmultiply < 10)
|
144
|
143
|
feedmultiply = 10;
|
|
@@ -381,9 +380,9 @@ static void lcd_move_menu_axis()
|
381
|
380
|
MENU_ITEM(back, MSG_MOVE_AXIS, lcd_move_menu);
|
382
|
381
|
MENU_ITEM(submenu, "Move X", lcd_move_x);
|
383
|
382
|
MENU_ITEM(submenu, "Move Y", lcd_move_y);
|
384
|
|
- MENU_ITEM(submenu, "Move Z", lcd_move_z);
|
385
|
383
|
if (move_menu_scale < 10.0)
|
386
|
384
|
{
|
|
385
|
+ MENU_ITEM(submenu, "Move Z", lcd_move_z);
|
387
|
386
|
MENU_ITEM(submenu, "Extruder", lcd_move_e);
|
388
|
387
|
}
|
389
|
388
|
END_MENU();
|
|
@@ -698,6 +697,8 @@ void lcd_init()
|
698
|
697
|
WRITE(SDCARDDETECT, HIGH);
|
699
|
698
|
lcd_oldcardstatus = IS_SD_INSERTED;
|
700
|
699
|
#endif//(SDCARDDETECT > -1)
|
|
700
|
+ lcd_buttons_update();
|
|
701
|
+ encoderDiff = 0;
|
701
|
702
|
}
|
702
|
703
|
|
703
|
704
|
void lcd_update()
|