Browse Source

Merge pull request #534 from xifle/Marlin_v1

Fixes compiler warning for feedrate deadzone
pull/1/head
daid 12 years ago
parent
commit
acb3271c9a
  1. 4
      Marlin/ultralcd.cpp

4
Marlin/ultralcd.cpp

@ -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;

Loading…
Cancel
Save