Merge pull request #534 from xifle/Marlin_v1

Fixes compiler warning for feedrate deadzone
12 years ago · acb3271c9a
parent d77f5ee722 61fe430d4f
commit acb3271c9a
1 changed files with 2 additions and 2 deletions
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@ -173,8 +173,8 @@ static void lcd_status_screen()
    }
    // Dead zone at 100% feedrate
-    if (feedmultiply < 100 && (feedmultiply + int(encoderPosition)) > 100 ||
+    if ((feedmultiply < 100 && (feedmultiply + int(encoderPosition)) > 100) ||
-            feedmultiply > 100 && (feedmultiply + int(encoderPosition)) < 100)
+            (feedmultiply > 100 && (feedmultiply + int(encoderPosition)) < 100))
    {
        encoderPosition = 0;
        feedmultiply = 100;