MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Patch to make Z look more like X and Y on UltraLCD

Browse Source
This commit is contained in:
Scott Lahteine 2014-12-06 20:59:06 -08:00
parent 3d1da45f3e
commit a2109cb492
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/ultralcd.cpp
View File

@ -1496,7 +1496,20 @@ char *ftostr12ns(const float &x)
return conv; return conv;
} }
// Convert int to lj string with +123.0 format // convert float to space-padded string with -_23.4_ format
char *ftostr32np(const float &x) {
char *c = ftostr32(x);
if (c[0] == '0' || c[0] == '-') {
if (c[0] == '0') c[0] = ' ';
if (c[1] == '0') c[1] = ' ';
}
if (c[5] == '0') {
c[5] = ' ';
if (c[4] == '0') c[4] = c[3] = ' ';
}
return c;
}
char *itostr31(const int &xx) char *itostr31(const int &xx)
{ {
conv[0]=(xx>=0)?'+':'-'; conv[0]=(xx>=0)?'+':'-';

1
Marlin/ultralcd.h
View File

@ -119,6 +119,7 @@ char *ftostr31ns(const float &x); // float to string without sign character
char *ftostr31(const float &x); char *ftostr31(const float &x);
char *ftostr32(const float &x); char *ftostr32(const float &x);
char *ftostr12ns(const float &x); char *ftostr12ns(const float &x);
char *ftostr32np(const float &x); // remove zero-padding from ftostr32
char *ftostr5(const float &x); char *ftostr5(const float &x);
char *ftostr51(const float &x); char *ftostr51(const float &x);
char *ftostr52(const float &x); char *ftostr52(const float &x);

2
Marlin/ultralcd_implementation_hitachi_HD44780.h
View File

@ -548,7 +548,7 @@ static void lcd_implementation_status_screen()
# endif//LCD_WIDTH > 19 # endif//LCD_WIDTH > 19
lcd.setCursor(LCD_WIDTH - 8, 1); lcd.setCursor(LCD_WIDTH - 8, 1);
lcd.print('Z'); lcd.print('Z');
lcd.print(ftostr32(current_position[Z_AXIS] + 0.00001)); lcd.print(ftostr32np(current_position[Z_AXIS] + 0.00001));
#endif//LCD_HEIGHT > 2 #endif//LCD_HEIGHT > 2
#if LCD_HEIGHT > 3 #if LCD_HEIGHT > 3