From 8178dec4c3820cd06d67fffab099bee4b5512448 Mon Sep 17 00:00:00 2001 From: Sergey Taranenko Date: Thu, 18 Oct 2012 17:45:40 +0400 Subject: [PATCH 1/2] Fix num of digits on LCD for E and Z axis. The number of steps per mm often contains 4 digits before the decimal point and does not require precision greater than 0.1 --- Marlin/ultralcd.pde | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/ultralcd.pde b/Marlin/ultralcd.pde index a2492ac6e2..3fb1f38d30 100644 --- a/Marlin/ultralcd.pde +++ b/Marlin/ultralcd.pde @@ -1858,7 +1858,7 @@ void MainMenu::showControlMotion() if(force_lcd_update) { lcd.setCursor(0,line);lcdprintPGM(MSG_ZSTEPS); - lcd.setCursor(11,line);lcd.print(ftostr52(axis_steps_per_unit[Z_AXIS])); + lcd.setCursor(11,line);lcd.print(ftostr51(axis_steps_per_unit[Z_AXIS])); } if((activeline!=line) ) @@ -1897,7 +1897,7 @@ void MainMenu::showControlMotion() if(force_lcd_update) { lcd.setCursor(0,line);lcdprintPGM(MSG_ESTEPS); - lcd.setCursor(11,line);lcd.print(ftostr52(axis_steps_per_unit[E_AXIS])); + lcd.setCursor(11,line);lcd.print(ftostr51(axis_steps_per_unit[E_AXIS])); } if((activeline!=line) ) From 2a67363e27d99687255ba2a174a6cc44572f1b07 Mon Sep 17 00:00:00 2001 From: Sergey Taranenko Date: Mon, 22 Oct 2012 11:05:17 +0400 Subject: [PATCH 2/2] =?UTF-8?q?Fix=20=E2=80=98prog=5Fuchar=E2=80=99=20defi?= =?UTF-8?q?nition=20in=20LiquidCrystalRus.cpp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/LiquidCrystalRus.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Marlin/LiquidCrystalRus.cpp b/Marlin/LiquidCrystalRus.cpp index 66bb370857..9f3f5c055b 100644 --- a/Marlin/LiquidCrystalRus.cpp +++ b/Marlin/LiquidCrystalRus.cpp @@ -1,3 +1,4 @@ +#define __PROG_TYPES_COMPAT__ #include "LiquidCrystalRus.h" #include @@ -13,7 +14,7 @@ // it is a russian alphabet translation // except 0401 --> 0xa2 = ╗, 0451 --> 0xb5 -PROGMEM prog_uchar utf_recode[] = +const PROGMEM prog_uchar utf_recode[] = { 0x41,0xa0,0x42,0xa1,0xe0,0x45,0xa3,0xa4,0xa5,0xa6,0x4b,0xa7,0x4d,0x48,0x4f, 0xa8,0x50,0x43,0x54,0xa9,0xaa,0x58,0xe1,0xab,0xac,0xe2,0xad,0xae,0x62,0xaf,0xb0,0xb1, 0x61,0xb2,0xb3,0xb4,0xe3,0x65,0xb6,0xb7,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,0x6f,