Browse Source

Merge pull request #276 from setar/Marlin_v1

Fix num of digits on LCD for E and Z axis.
ErikZalm 12 years ago
parent
commit
a7e40b2903
2 changed files with 4 additions and 3 deletions
  1. 2
    1
      Marlin/LiquidCrystalRus.cpp
  2. 2
    2
      Marlin/ultralcd.pde

+ 2
- 1
Marlin/LiquidCrystalRus.cpp View File

@@ -1,3 +1,4 @@
1
+#define __PROG_TYPES_COMPAT__
1 2
 #include "LiquidCrystalRus.h"
2 3
 
3 4
 #include <stdio.h>
@@ -13,7 +14,7 @@
13 14
 
14 15
 // it is a russian alphabet translation
15 16
 // except 0401 --> 0xa2 = ╗, 0451 --> 0xb5
16
-PROGMEM prog_uchar utf_recode[] = 
17
+const PROGMEM prog_uchar utf_recode[] = 
17 18
        { 0x41,0xa0,0x42,0xa1,0xe0,0x45,0xa3,0xa4,0xa5,0xa6,0x4b,0xa7,0x4d,0x48,0x4f,
18 19
          0xa8,0x50,0x43,0x54,0xa9,0xaa,0x58,0xe1,0xab,0xac,0xe2,0xad,0xae,0x62,0xaf,0xb0,0xb1,
19 20
          0x61,0xb2,0xb3,0xb4,0xe3,0x65,0xb6,0xb7,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,0x6f,

+ 2
- 2
Marlin/ultralcd.pde View File

@@ -1857,7 +1857,7 @@ void MainMenu::showControlMotion()
1857 1857
       if(force_lcd_update)
1858 1858
         {
1859 1859
           lcd.setCursor(0,line);lcdprintPGM(MSG_ZSTEPS);
1860
-          lcd.setCursor(11,line);lcd.print(ftostr52(axis_steps_per_unit[Z_AXIS]));
1860
+          lcd.setCursor(11,line);lcd.print(ftostr51(axis_steps_per_unit[Z_AXIS]));
1861 1861
         }
1862 1862
         
1863 1863
         if((activeline!=line) )
@@ -1896,7 +1896,7 @@ void MainMenu::showControlMotion()
1896 1896
       if(force_lcd_update)
1897 1897
         {
1898 1898
           lcd.setCursor(0,line);lcdprintPGM(MSG_ESTEPS);
1899
-          lcd.setCursor(11,line);lcd.print(ftostr52(axis_steps_per_unit[E_AXIS]));
1899
+          lcd.setCursor(11,line);lcd.print(ftostr51(axis_steps_per_unit[E_AXIS]));
1900 1900
         }
1901 1901
         
1902 1902
         if((activeline!=line) )

Loading…
Cancel
Save