andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-01-31 19:19:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #718 from MichaelDvP/dev

Browse Source 
fix #717, rounding error
This commit is contained in:
Proddy
2022-11-01 18:09:31 +01:00
committed by GitHub
parent 2c056d6807 756a136124
commit bdce4ee9f9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/helpers.cpp
View File

@@ -297,7 +297,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 + format / 2) * 10 / format, s, 10), sizeof(s)); strlcat(result, itoa(((new_value % format) * 10 + format / 2) / 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));
} }
@@ -338,7 +338,7 @@ char * Helpers::render_value(char * result, const uint32_t value, const int8_t f
return nullptr; return nullptr;
} }
result[0] = '\0'; result[0] = '\0';
int32_t new_value = fahrenheit ? format ? value * 1.8 + 32 * format * (fahrenheit - 1) : value * 1.8 + 32 * (fahrenheit - 1) : value; uint32_t new_value = fahrenheit ? format ? value * 1.8 + 32 * format * (fahrenheit - 1) : value * 1.8 + 32 * (fahrenheit - 1) : value;
char s[10] = {0}; char s[10] = {0};
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
@@ -347,7 +347,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 + format / 2) * 10 / format, s, 10), sizeof(s)); strlcat(result, itoa(((new_value % format) * 10 + format / 2) / 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));
} }