Merge pull request #534 from xifle/Marlin_v1

Fixes compiler warning for feedrate deadzone
This commit is contained in:
daid 2013-07-01 23:41:51 -07:00
commit acb3271c9a

View File

@ -173,8 +173,8 @@ static void lcd_status_screen()
} }
// Dead zone at 100% feedrate // 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; encoderPosition = 0;
feedmultiply = 100; feedmultiply = 100;