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

Show more decimals in Display, if possible

Browse source 
_123, -123, _-12, __-1  plus  1234, 12.3, -1.2
This commit is contained in:
Guthenberg 2016-12-01 15:40:57 +01:00 committed by Scott Lahteine
parent 1e30d1da47
commit bfb8d3b53e
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Marlin/utility.cpp
View file

@ -129,6 +129,30 @@ void safe_delay(millis_t ms) {
return conv; return conv;
} }
// Convert float to rj string with 1234, _123, -123, _-12, 12.3, _1.2, or -1.2 format
char *ftostr4sign(const float& fx) {
int x = fx * 10, xx = abs(x);
bool ispos = x >= 0,
isten = xx >= 100,
ishun = xx >= 1000;
if (!isten || (ispos && !ishun)) {
// 12.3, _1.2, -1.2
conv[0] = ispos ? (isten ? DIGIMOD(xx, 100) : ' ') : '-';
conv[1] = DIGIMOD(xx, 10);
conv[2] = '.';
conv[3] = DIGIMOD(xx, 1);
}
else {
// 1234, _123, -123, _-12
conv[0] = ispos ? (xx >= 10000 ? DIGIMOD(xx, 10000) : ' ') : (ishun ? '-' : ' ');
conv[1] = ishun ? DIGIMOD(xx, 1000) : '-';
conv[2] = DIGIMOD(xx, 100);
conv[3] = DIGIMOD(xx, 10);
}
conv[4] = '\0';
return conv;
}
// Convert float to fixed-length string with +123.4 / -123.4 format // Convert float to fixed-length string with +123.4 / -123.4 format
char* ftostr41sign(const float& x) { char* ftostr41sign(const float& x) {
int xx = x * 10; int xx = x * 10;

4
Marlin/utility.h
View file

@ -69,8 +69,8 @@ void safe_delay(millis_t ms);
// Convert float to rj string with 123 or -12 format // Convert float to rj string with 123 or -12 format
FORCE_INLINE char *ftostr3(const float& x) { return itostr3((int)x); } FORCE_INLINE char *ftostr3(const float& x) { return itostr3((int)x); }
// Convert float to rj string with _123, -123, _-12, or __-1 format // Convert float to rj string with 1234, _123, 12.3, _1.2, -123, _-12, or -1.2 format
FORCE_INLINE char *ftostr4sign(const float& x) { return itostr4sign((int)x); } char *ftostr4sign(const float& fx);
#endif // ULTRA_LCD #endif // ULTRA_LCD