|
@@ -432,13 +432,13 @@ static void lcd_status_screen() {
|
432
|
432
|
}
|
433
|
433
|
|
434
|
434
|
#if ENABLED(ULTIPANEL_FEEDMULTIPLY)
|
|
435
|
+ int new_frm = feedrate_multiplier + int(encoderPosition);
|
435
|
436
|
// Dead zone at 100% feedrate
|
436
|
|
- if ((feedrate_multiplier < 100 && (feedrate_multiplier + int(encoderPosition)) > 100) ||
|
437
|
|
- (feedrate_multiplier > 100 && (feedrate_multiplier + int(encoderPosition)) < 100)) {
|
438
|
|
- encoderPosition = 0;
|
|
437
|
+ if ((feedrate_multiplier < 100 && new_frm > 100) || (feedrate_multiplier > 100 && new_frm < 100)) {
|
439
|
438
|
feedrate_multiplier = 100;
|
|
439
|
+ encoderPosition = 0;
|
440
|
440
|
}
|
441
|
|
- if (feedrate_multiplier == 100) {
|
|
441
|
+ else if (feedrate_multiplier == 100) {
|
442
|
442
|
if (int(encoderPosition) > ENCODER_FEEDRATE_DEADZONE) {
|
443
|
443
|
feedrate_multiplier += int(encoderPosition) - (ENCODER_FEEDRATE_DEADZONE);
|
444
|
444
|
encoderPosition = 0;
|
|
@@ -449,7 +449,7 @@ static void lcd_status_screen() {
|
449
|
449
|
}
|
450
|
450
|
}
|
451
|
451
|
else {
|
452
|
|
- feedrate_multiplier += int(encoderPosition);
|
|
452
|
+ feedrate_multiplier = new_frm;
|
453
|
453
|
encoderPosition = 0;
|
454
|
454
|
}
|
455
|
455
|
#endif // ULTIPANEL_FEEDMULTIPLY
|