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

mqtt decimals: remove trailing zeros

Browse Source
This commit is contained in:
MichaelDvP
2026-01-08 21:18:16 +01:00
parent 82d160cabb
commit 34ff5f12ea
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/helpers.cpp
View File

@@ -207,6 +207,18 @@ char * Helpers::render_boolean(char * result, const bool value, const bool dashb
return result; return result;
} }
char * Helpers::remove_trailing_zero(char * result) {
if (strchr(result, '.')) {
while (result[strlen(result) - 1] == '0') {
result[strlen(result) - 1] = '\0';
}
if (result[strlen(result) - 1] == '.') {
result[strlen(result) - 1] = '\0';
}
}
return result;
}
// convert unsigned int (single byte) to text value and returns it // convert unsigned int (single byte) to text value and returns it
// format: 255(0xFF)=boolean, 0=no formatting, otherwise divide by format // format: 255(0xFF)=boolean, 0=no formatting, otherwise divide by format
char * Helpers::render_value(char * result, uint8_t value, int8_t format, const uint8_t fahrenheit) { char * Helpers::render_value(char * result, uint8_t value, int8_t format, const uint8_t fahrenheit) {
@@ -240,14 +252,11 @@ char * Helpers::render_value(char * result, uint8_t value, int8_t format, const
strlcpy(result, itoa(new_value >> 1, s2, 10), 5); strlcpy(result, itoa(new_value >> 1, s2, 10), 5);
strlcat(result, ".", 5); strlcat(result, ".", 5);
strlcat(result, ((new_value & 0x01) ? "5" : "0"), 7); strlcat(result, ((new_value & 0x01) ? "5" : "0"), 7);
return result;
} else if (format == 4) { } else if (format == 4) {
strlcpy(result, itoa(new_value >> 2, s2, 10), 5); strlcpy(result, itoa(new_value >> 2, s2, 10), 5);
strlcat(result, ".", 5); strlcat(result, ".", 5);
new_value = (new_value & 0x03) * 25; new_value = (new_value & 0x03) * 25;
strlcat(result, itoa(new_value, s2, 10), 7); strlcat(result, itoa(new_value, s2, 10), 7);
return result;
} else if (format > 0) { } else if (format > 0) {
strlcpy(result, itoa(new_value / format, s2, 10), 5); strlcpy(result, itoa(new_value / format, s2, 10), 5);
strlcat(result, ".", 5); strlcat(result, ".", 5);
@@ -256,7 +265,7 @@ char * Helpers::render_value(char * result, uint8_t value, int8_t format, const
strlcpy(result, itoa(new_value * format * -1, s2, 10), 5); strlcpy(result, itoa(new_value * format * -1, s2, 10), 5);
} }
return result; return remove_trailing_zero(result);
} }
// float: convert float to char // float: convert float to char
@@ -297,7 +306,7 @@ char * Helpers::render_value(char * result, const double value, const int8_t for
} }
itoa(decimal, result, 10); itoa(decimal, result, 10);
return ret; return remove_trailing_zero(ret);
} }
// int32: convert signed 32bit to text string and returns string // int32: convert signed 32bit to text string and returns string
@@ -335,7 +344,7 @@ char * Helpers::render_value(char * result, const int32_t value, const int8_t fo
strlcat(result, itoa(new_value * format * -1, s, 10), sizeof(s)); strlcat(result, itoa(new_value * format * -1, s, 10), sizeof(s));
} }
return result; return remove_trailing_zero(result);
} }
// int16: convert short (two bytes) to text string and prints it // int16: convert short (two bytes) to text string and prints it
@@ -397,7 +406,7 @@ char * Helpers::render_value(char * result, const uint32_t value, const int8_t f
} }
#endif #endif
return result; return remove_trailing_zero(result);
} }
// convert special Latin1 characters to UTF8 // convert special Latin1 characters to UTF8

2
src/core/helpers.h
View File

@@ -88,6 +88,8 @@ class Helpers {
#ifdef EMSESP_STANDALONE #ifdef EMSESP_STANDALONE
static char * ultostr(char * ptr, uint32_t value, const uint8_t base); static char * ultostr(char * ptr, uint32_t value, const uint8_t base);
#endif #endif
private:
static char * remove_trailing_zero(char * result);
}; };
} // namespace emsesp } // namespace emsesp