|
@@ -1445,6 +1445,7 @@ char *ftostr12ns(const float &x)
|
1445
|
1445
|
|
1446
|
1446
|
// convert float to space-padded string with -_23.4_ format
|
1447
|
1447
|
char *ftostr32np(const float &x) {
|
|
1448
|
+<<<<<<< HEAD
|
1448
|
1449
|
long xx = abs(x * 100);
|
1449
|
1450
|
uint8_t dig;
|
1450
|
1451
|
|
|
@@ -1488,6 +1489,18 @@ char *ftostr32np(const float &x) {
|
1488
|
1489
|
}
|
1489
|
1490
|
conv[6] = '\0';
|
1490
|
1491
|
return conv;
|
|
1492
|
+=======
|
|
1493
|
+ char *c = ftostr32(x);
|
|
1494
|
+ if (c[0] == '0' || c[0] == '-') {
|
|
1495
|
+ if (c[0] == '0') c[0] = ' ';
|
|
1496
|
+ if (c[1] == '0') c[1] = ' ';
|
|
1497
|
+ }
|
|
1498
|
+ if (c[5] == '0') {
|
|
1499
|
+ c[5] = ' ';
|
|
1500
|
+ if (c[4] == '0') c[4] = c[3] = ' ';
|
|
1501
|
+ }
|
|
1502
|
+ return c;
|
|
1503
|
+>>>>>>> Patch to make Z look more like X and Y on UltraLCD
|
1491
|
1504
|
}
|
1492
|
1505
|
|
1493
|
1506
|
char *itostr31(const int &xx)
|