andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 16:59:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'emsesp:dev' into dev

Browse Source
This commit is contained in:
pswid
2022-11-10 15:03:57 +01:00
committed by GitHub
parent dccd9f09e7 96bb3013a3
commit ea2c9cbc9a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/helpers.cpp
View File

@@ -262,6 +262,11 @@ char * Helpers::render_value(char * result, const float value, const int8_t form
*result++ = '.'; *result++ = '.';
int32_t decimal = abs((int32_t)((value - whole) * p[format])); int32_t decimal = abs((int32_t)((value - whole) * p[format]));
for (int8_t i = 1; i < format; i++) {
if (decimal < p[i]) {
*result++ = '0'; // add leading zeros
}
}
itoa(decimal, result, 10); itoa(decimal, result, 10);
return ret; return ret;
@@ -297,7 +302,7 @@ char * Helpers::render_value(char * result, const int32_t value, const int8_t fo
} else if (format > 0) { } else if (format > 0) {
strlcat(result, itoa(new_value / format, s, 10), sizeof(s)); strlcat(result, itoa(new_value / format, s, 10), sizeof(s));
strlcat(result, ".", sizeof(s)); strlcat(result, ".", sizeof(s));
strlcat(result, itoa(((new_value % format) * 10 + format / 2) / format, s, 10), sizeof(s)); strlcat(result, itoa(((new_value % format) * 10) / format, s, 10), sizeof(s));
} else { } else {
strlcat(result, itoa(new_value * format * -1, s, 10), sizeof(s)); strlcat(result, itoa(new_value * format * -1, s, 10), sizeof(s));
} }
@@ -347,7 +352,7 @@ char * Helpers::render_value(char * result, const uint32_t value, const int8_t f
} else if (format > 0) { } else if (format > 0) {
strlcpy(result, ltoa(new_value / format, s, 10), sizeof(s)); strlcpy(result, ltoa(new_value / format, s, 10), sizeof(s));
strlcat(result, ".", sizeof(s)); strlcat(result, ".", sizeof(s));
strlcat(result, itoa(((new_value % format) * 10 + format / 2) / format, s, 10), sizeof(s)); strlcat(result, itoa(((new_value % format) * 10) / format, s, 10), sizeof(s));
} else { } else {
strlcpy(result, ltoa(new_value * format * -1, s, 10), sizeof(s)); strlcpy(result, ltoa(new_value * format * -1, s, 10), sizeof(s));
} }