Merge https://github.com/ErikZalm/Marlin into Marlin_v1

2014-10-21 12:06:56 +01:00
parent 6c5a460e65 724197454c
commit b81021f475
17 changed files with 514 additions and 77 deletions
--- a/Marlin/ultralcd_implementation_hitachi_HD44780.h
+++ b/Marlin/ultralcd_implementation_hitachi_HD44780.h
@ -475,7 +475,7 @@ static void lcd_implementation_status_screen()
 # endif//LCD_WIDTH > 19
    lcd.setCursor(LCD_WIDTH - 8, 1);
    lcd.print('Z');
-    lcd.print(ftostr32(current_position[Z_AXIS]));
+    lcd.print(ftostr32(current_position[Z_AXIS] + 0.00001));
 #endif//LCD_HEIGHT > 2

 #if LCD_HEIGHT > 3