andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #3306 from thinkyhead/rc_fix_num2str 

Clean up num2str functions, extend ftostr43
pull/1/head
Scott Lahteine 9 years ago
parent
6791401ca7 fcedfd6e99
commit
9c43369ebb
2 changed files with 59 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 98
      Marlin/ultralcd.cpp
  2. 8
      Marlin/ultralcd.h

98
Marlin/ultralcd.cpp
View File

@ -2166,7 +2166,7 @@ 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 _123, -123, _-12, or __-1 format
char *ftostr4sign(const float& x) { return itostr4sign((int)x); } char *ftostr4sign(const float& x) { return itostr4sign((int)x); }
// Convert int to string with 12 format // Convert unsigned int to string with 12 format
char* itostr2(const uint8_t& x) { char* itostr2(const uint8_t& x) {
//sprintf(conv,"%5.1f",x); //sprintf(conv,"%5.1f",x);
int xx = x; int xx = x;
@ -2176,7 +2176,7 @@ char* itostr2(const uint8_t& x) {
return conv; return conv;
} }
// Convert float to string with +123.4 format // Convert float to string with +123.4 / -123.4 format
char* ftostr31(const float& x) { char* ftostr31(const float& x) {
int xx = abs(x * 10); int xx = abs(x * 10);
conv[0] = (x >= 0) ? '+' : '-'; conv[0] = (x >= 0) ? '+' : '-';
@ -2189,7 +2189,7 @@ char* ftostr31(const float& x) {
return conv; return conv;
} }
// Convert float to string with 123.4 format, dropping sign // Convert unsigned float to string with 123.4 format, dropping sign
char* ftostr31ns(const float& x) { char* ftostr31ns(const float& x) {
int xx = abs(x * 10); int xx = abs(x * 10);
conv[0] = (xx / 1000) % 10 + '0'; conv[0] = (xx / 1000) % 10 + '0';
@ -2201,7 +2201,7 @@ char* ftostr31ns(const float& x) {
return conv; return conv;
} }
// Convert float to string with 123.45 format // Convert signed float to string with 023.45 / -23.45 format
char *ftostr32(const float& x) { char *ftostr32(const float& x) {
long xx = abs(x * 100); long xx = abs(x * 100);
conv[0] = x >= 0 ? (xx / 10000) % 10 + '0' : '-'; conv[0] = x >= 0 ? (xx / 10000) % 10 + '0' : '-';
@ -2214,23 +2214,27 @@ char *ftostr32(const float& x) {
return conv; return conv;
} }
// Convert float to string with 1.234 format // Convert signed float to string (len 5 or 6) with 1.234 / -1.234 format
char* ftostr43(const float& x) { char* ftostr43(const float& x) {
long xx = x * 1000; long xx = x * 1000;
if (xx >= 0) char *conv_ptr = conv;
conv[0] = (xx / 1000) % 10 + '0'; if (xx >= 0) {
else *conv_ptr++ = ' ';
}
else {
conv[0] = '-'; conv[0] = '-';
xx = abs(xx); xx = -xx;
conv[1] = '.'; }
conv[2] = (xx / 100) % 10 + '0'; conv[1] = (xx / 1000) % 10 + '0';
conv[3] = (xx / 10) % 10 + '0'; conv[2] = '.';
conv[4] = (xx) % 10 + '0'; conv[3] = (xx / 100) % 10 + '0';
conv[5] = 0; conv[4] = (xx / 10) % 10 + '0';
return conv; conv[5] = (xx) % 10 + '0';
conv[6] = 0;
return conv_ptr;
} }
// Convert float to string with 1.23 format // Convert unsigned float to string with 1.23 format
char* ftostr12ns(const float& x) { char* ftostr12ns(const float& x) {
long xx = x * 100; long xx = x * 100;
xx = abs(xx); xx = abs(xx);
@ -2242,11 +2246,12 @@ char* ftostr12ns(const float& x) {
return conv; return conv;
} }
// Convert float to space-padded string with -_23.4_ format // Convert signed float to space-padded string with -_23.4_ format
char* ftostr32sp(const float& x) { char* ftostr32sp(const float& x) {
long xx = abs(x * 100); long xx = x * 100;
uint8_t dig; uint8_t dig;
if (x < 0) { // negative val = -_0 if (xx < 0) { // negative val = -_0
xx = -xx;
conv[0] = '-'; conv[0] = '-';
dig = (xx / 1000) % 10; dig = (xx / 1000) % 10;
conv[1] = dig ? '0' + dig : ' '; conv[1] = dig ? '0' + dig : ' ';
@ -2287,10 +2292,17 @@ char* ftostr32sp(const float& x) {
return conv; return conv;
} }
// Convert int to lj string with +123.0 format // Convert signed int to lj string with +012.0 / -012.0 format
char* itostr31(const int& x) { char* itostr31(const int& x) {
conv[0] = x >= 0 ? '+' : '-'; int xx;
int xx = abs(x); if (x >= 0) {
conv[0] = '+';
xx = x;
}
else {
conv[0] = '-';
xx = -x;
}
conv[1] = (xx / 100) % 10 + '0'; conv[1] = (xx / 100) % 10 + '0';
conv[2] = (xx / 10) % 10 + '0'; conv[2] = (xx / 10) % 10 + '0';
conv[3] = xx % 10 + '0'; conv[3] = xx % 10 + '0';
@ -2300,7 +2312,7 @@ char* itostr31(const int& x) {
return conv; return conv;
} }
// Convert int to rj string with 123 or -12 format // Convert signed int to rj string with 123 or -12 format
char* itostr3(const int& x) { char* itostr3(const int& x) {
int xx = x; int xx = x;
if (xx < 0) { if (xx < 0) {
@ -2316,37 +2328,37 @@ char* itostr3(const int& x) {
return conv; return conv;
} }
// Convert int to lj string with 123 format // Convert unsigned int to lj string with 123 format
char* itostr3left(const int& xx) { char* itostr3left(const int& x) {
if (xx >= 100) { if (x >= 100) {
conv[0] = (xx / 100) % 10 + '0'; conv[0] = (x / 100) % 10 + '0';
conv[1] = (xx / 10) % 10 + '0'; conv[1] = (x / 10) % 10 + '0';
conv[2] = xx % 10 + '0'; conv[2] = x % 10 + '0';
conv[3] = 0; conv[3] = 0;
} }
else if (xx >= 10) { else if (x >= 10) {
conv[0] = (xx / 10) % 10 + '0'; conv[0] = (x / 10) % 10 + '0';
conv[1] = xx % 10 + '0'; conv[1] = x % 10 + '0';
conv[2] = 0; conv[2] = 0;
} }
else { else {
conv[0] = xx % 10 + '0'; conv[0] = x % 10 + '0';
conv[1] = 0; conv[1] = 0;
} }
return conv; return conv;
} }
// Convert int to rj string with 1234 format // Convert unsigned int to rj string with 1234 format
char* itostr4(const int& xx) { char* itostr4(const int& x) {
conv[0] = xx >= 1000 ? (xx / 1000) % 10 + '0' : ' '; conv[0] = x >= 1000 ? (x / 1000) % 10 + '0' : ' ';
conv[1] = xx >= 100 ? (xx / 100) % 10 + '0' : ' '; conv[1] = x >= 100 ? (x / 100) % 10 + '0' : ' ';
conv[2] = xx >= 10 ? (xx / 10) % 10 + '0' : ' '; conv[2] = x >= 10 ? (x / 10) % 10 + '0' : ' ';
conv[3] = xx % 10 + '0'; conv[3] = x % 10 + '0';
conv[4] = 0; conv[4] = 0;
return conv; return conv;
} }
// Convert int to rj string with _123, -123, _-12, or __-1 format // Convert signed int to rj string with _123, -123, _-12, or __-1 format
char *itostr4sign(const int& x) { char *itostr4sign(const int& x) {
int xx = abs(x); int xx = abs(x);
int sign = 0; int sign = 0;
@ -2370,7 +2382,7 @@ char *itostr4sign(const int& x) {
return conv; return conv;
} }
// Convert float to rj string with 12345 format // Convert unsigned float to rj string with 12345 format
char* ftostr5(const float& x) { char* ftostr5(const float& x) {
long xx = abs(x); long xx = abs(x);
conv[0] = xx >= 10000 ? (xx / 10000) % 10 + '0' : ' '; conv[0] = xx >= 10000 ? (xx / 10000) % 10 + '0' : ' ';
@ -2382,7 +2394,7 @@ char* ftostr5(const float& x) {
return conv; return conv;
} }
// Convert float to string with +1234.5 format // Convert signed float to string with +1234.5 format
char* ftostr51(const float& x) { char* ftostr51(const float& x) {
long xx = abs(x * 10); long xx = abs(x * 10);
conv[0] = (x >= 0) ? '+' : '-'; conv[0] = (x >= 0) ? '+' : '-';
@ -2396,7 +2408,7 @@ char* ftostr51(const float& x) {
return conv; return conv;
} }
// Convert float to string with +123.45 format // Convert signed float to string with +123.45 format
char* ftostr52(const float& x) { char* ftostr52(const float& x) {
conv[0] = (x >= 0) ? '+' : '-'; conv[0] = (x >= 0) ? '+' : '-';
long xx = abs(x * 100); long xx = abs(x * 100);

8
Marlin/ultralcd.h
View File

@ -145,10 +145,10 @@
#endif //ULTRA_LCD #endif //ULTRA_LCD
char* itostr2(const uint8_t& x); char* itostr2(const uint8_t& x);
char* itostr31(const int& xx); char* itostr31(const int& x);
char* itostr3(const int& xx); char* itostr3(const int& x);
char* itostr3left(const int& xx); char* itostr3left(const int& x);
char* itostr4(const int& xx); char* itostr4(const int& x);
char* itostr4sign(const int& x); char* itostr4sign(const int& x);
char* ftostr3(const float& x); char* ftostr3(const float& x);

Write Preview
Loading…
Cancel
Save