zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

As it should be

Browse source
This commit is contained in:
Scott Lahteine 2014-12-22 17:04:22 -08:00
parent f80a602783
commit e83ecec809
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Marlin/ultralcd.cpp
View file

@ -1445,6 +1445,7 @@ char *ftostr12ns(const float &x)
// convert float to space-padded string with -_23.4_ format // convert float to space-padded string with -_23.4_ format
char *ftostr32np(const float &x) { char *ftostr32np(const float &x) {
<<<<<<< HEAD
long xx = abs(x * 100); long xx = abs(x * 100);
uint8_t dig; uint8_t dig;
@ -1488,6 +1489,18 @@ char *ftostr32np(const float &x) {
} }
conv[6] = '\0'; conv[6] = '\0';
return conv; return conv;
=======
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;
>>>>>>> Patch to make Z look more like X and Y on UltraLCD
} }
char *itostr31(const int &xx) char *itostr31(const int &xx)