3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-27 22:08:02 +00:00
Code Issues 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 449dad71f2
commit d1f21d1189
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

@ -1498,6 +1498,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;
@ -1541,6 +1542,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)