Browse Source

Small cleanup of feedrate dead-zone

Scott Lahteine 9 years ago
parent
commit
f936df9507
1 changed files with 5 additions and 5 deletions
  1. 5
    5
      Marlin/ultralcd.cpp

+ 5
- 5
Marlin/ultralcd.cpp View File

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

Loading…
Cancel
Save