MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch a display issue with LCD_DECIMAL_SMALL_XY

Browse Source 
The `ftostr4sign` function got munged by the `WITHIN` patch
This commit is contained in:
Scott Lahteine 2017-04-09 10:25:35 -05:00 committed by GitHub
parent 1a3cd6a090
commit e48a52a530
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/utility.cpp
View File

@ -134,7 +134,7 @@ void safe_delay(millis_t ms) {
// Convert float to rj string with 1234, _123, -123, _-12, 12.3, _1.2, or -1.2 format // Convert float to rj string with 1234, _123, -123, _-12, 12.3, _1.2, or -1.2 format
char *ftostr4sign(const float& fx) { char *ftostr4sign(const float& fx) {
int x = fx * 10; int x = fx * 10;
if (WITHIN(x, -99, 999)) return itostr4sign((int)fx); if (!WITHIN(x, -99, 999)) return itostr4sign((int)fx);
int xx = abs(x); int xx = abs(x);
conv[0] = x < 0 ? '-' : (xx >= 100 ? DIGIMOD(xx, 100) : ' '); conv[0] = x < 0 ? '-' : (xx >= 100 ? DIGIMOD(xx, 100) : ' ');
conv[1] = DIGIMOD(xx, 10); conv[1] = DIGIMOD(xx, 10);