CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Additional cleanup of ultralcd.cpp

Browse Source
This commit is contained in:
Scott Lahteine 2015-04-11 04:56:08 -07:00
parent 388dd0cfa5
commit 055b11814a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Marlin/ultralcd.cpp
View File

@ -304,12 +304,10 @@ static void lcd_status_screen() {
if (ignore_click) { if (ignore_click) {
if (wait_for_unclick) { if (wait_for_unclick) {
if (!current_click) { if (!current_click)
ignore_click = wait_for_unclick = false; ignore_click = wait_for_unclick = false;
} else
else {
current_click = false; current_click = false;
}
} }
else if (current_click) { else if (current_click) {
lcd_quick_feedback(); lcd_quick_feedback();
@ -337,15 +335,17 @@ static void lcd_status_screen() {
encoderPosition = 0; encoderPosition = 0;
feedmultiply = 100; feedmultiply = 100;
} }
if (feedmultiply == 100 && int(encoderPosition) > ENCODER_FEEDRATE_DEADZONE) { if (feedmultiply == 100) {
feedmultiply += int(encoderPosition) - ENCODER_FEEDRATE_DEADZONE; if (int(encoderPosition) > ENCODER_FEEDRATE_DEADZONE) {
encoderPosition = 0; feedmultiply += int(encoderPosition) - ENCODER_FEEDRATE_DEADZONE;
encoderPosition = 0;
}
else if (int(encoderPosition) < -ENCODER_FEEDRATE_DEADZONE) {
feedmultiply += int(encoderPosition) + ENCODER_FEEDRATE_DEADZONE;
encoderPosition = 0;
}
} }
else if (feedmultiply == 100 && int(encoderPosition) < -ENCODER_FEEDRATE_DEADZONE) { else {
feedmultiply += int(encoderPosition) + ENCODER_FEEDRATE_DEADZONE;
encoderPosition = 0;
}
else if (feedmultiply != 100) {
feedmultiply += int(encoderPosition); feedmultiply += int(encoderPosition);
encoderPosition = 0; encoderPosition = 0;
} }