From 01aac2a1423cb9e8e47a3993f84709fd24b1aabf Mon Sep 17 00:00:00 2001
From: daid303 <daid303@gmail.com>
Date: Fri, 21 Dec 2012 16:14:47 +0100
Subject: [PATCH] Small changes on the LCD panel, let the speed control work
 better, line up the parameter edit the same as the menu, remove some unused
 defines, and remove the Z from the 10mm move menu.

---
 Marlin/Marlin_main.cpp                           | 1 +
 Marlin/language.h                                | 1 +
 Marlin/ultralcd.cpp                              | 7 ++++---
 Marlin/ultralcd.h                                | 3 ---
 Marlin/ultralcd_implementation_hitachi_HD44780.h | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index d871e538f..1dc4c2103 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -859,6 +859,7 @@ void process_commands()
           lcd_update();
         }
       }
+      LCD_MESSAGEPGM(MSG_RESUMING);
     }
     break;
 #endif
diff --git a/Marlin/language.h b/Marlin/language.h
index c630217bf..3ae44beec 100644
--- a/Marlin/language.h
+++ b/Marlin/language.h
@@ -102,6 +102,7 @@
 	#define MSG_NO_CARD "No Card"
 	#define MSG_DWELL "Sleep..."
 	#define MSG_USERWAIT "Wait for user..."
+	#define MSG_RESUMING "Resuming print"
 	#define MSG_NO_MOVE "No move."
 	#define MSG_KILLED "KILLED. "
 	#define MSG_STOPPED "STOPPED. "
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index e5c1ed2e5..cd9cedf97 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -137,8 +137,7 @@ static void lcd_status_screen()
         currentMenu = lcd_main_menu;
         lcd_quick_feedback();
     }
-    if (abs(encoderPosition / 2) > 1)
-        feedmultiply += encoderPosition / 2;
+    feedmultiply += int(encoderPosition);
     encoderPosition = 0;
     if (feedmultiply < 10)
         feedmultiply = 10;
@@ -381,9 +380,9 @@ static void lcd_move_menu_axis()
     MENU_ITEM(back, MSG_MOVE_AXIS, lcd_move_menu);
     MENU_ITEM(submenu, "Move X", lcd_move_x);
     MENU_ITEM(submenu, "Move Y", lcd_move_y);
-    MENU_ITEM(submenu, "Move Z", lcd_move_z);
     if (move_menu_scale < 10.0)
     {
+        MENU_ITEM(submenu, "Move Z", lcd_move_z);
         MENU_ITEM(submenu, "Extruder", lcd_move_e);
     }
     END_MENU();
@@ -698,6 +697,8 @@ void lcd_init()
     WRITE(SDCARDDETECT, HIGH);
     lcd_oldcardstatus = IS_SD_INSERTED;
 #endif//(SDCARDDETECT > -1)
+    lcd_buttons_update();
+    encoderDiff = 0;
 }
 
 void lcd_update()
diff --git a/Marlin/ultralcd.h b/Marlin/ultralcd.h
index ec8c66a40..df7746a1a 100644
--- a/Marlin/ultralcd.h
+++ b/Marlin/ultralcd.h
@@ -62,9 +62,6 @@
 
   #define LCD_MESSAGEPGM(x) 
   #define LCD_ALERTMESSAGEPGM(x) 
-
-  #define CLICKED false
-  #define BLOCK ;
 #endif 
 
 char *itostr2(const uint8_t &x);
diff --git a/Marlin/ultralcd_implementation_hitachi_HD44780.h b/Marlin/ultralcd_implementation_hitachi_HD44780.h
index 8079a2016..0390a0baa 100644
--- a/Marlin/ultralcd_implementation_hitachi_HD44780.h
+++ b/Marlin/ultralcd_implementation_hitachi_HD44780.h
@@ -363,7 +363,7 @@ static void lcd_implementation_drawmenu_setting_edit_generic_P(uint8_t row, cons
 #define lcd_implementation_drawmenu_setting_edit_bool(row, pstr, pstr2, data) lcd_implementation_drawmenu_setting_edit_generic_P(row, pstr, ' ', (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
 void lcd_implementation_drawedit(const char* pstr, char* value)
 {
-    lcd.setCursor(0, 1);
+    lcd.setCursor(1, 1);
     lcd_printPGM(pstr);
     lcd.print(':');
     lcd.setCursor(19 - strlen(value), 1);