Merge remote-tracking branch 'upstream/dev' into MM10

This commit is contained in:
MichaelDvP
2020-01-01 16:44:44 +01:00
3 changed files with 14 additions and 9 deletions

View File

@@ -76,11 +76,11 @@ char * _short_to_char(char * s, int16_t value, uint8_t decimals) {
return s;
}
// convert short (two bytes) to text string and prints it
// convert unsigned short (two bytes) to text string and prints it
// decimals: 0 = no division, 1=divide value by 10, 2=divide by 2, 10=divide value by 100
char * _ushort_to_char(char * s, uint16_t value, uint8_t decimals) {
// remove errors or invalid values
if (value == EMS_VALUE_USHORT_NOTSET) {
if (value >= EMS_VALUE_USHORT_NOTSET) {
strlcpy(s, "?", 10);
return (s);
}