Skip to content

Decode Elster sentinel values as unavailable instead of garbage numbers #364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adrai wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Decode Elster sentinel values as unavailable instead of garbage numbers #364

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions components/wp_core/type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "type.h"

#include <algorithm>
#include <cmath>
#include <string>

#include "mapper.h"
Expand All @@ -28,10 +29,20 @@ SimpleVariant GetValueByType(const std::uint16_t value, const Type type) {
case Type::et_byte:
return (static_cast<float>(value & 0xFF));
case Type::et_dec_val:
// 0x8000 = "not available", 0x9000 = "AUS" (e.g. MINTEMP shows "AUS" on the panel)
if (value == 0x8000U || value == 0x9000U) {
return NAN;
}
return (static_cast<std::int16_t>(value) / 10.0f);
case Type::et_cent_val:
if (value == 0x8000U) { // "not available"
return NAN;
}
return (static_cast<std::int16_t>(value) / 100.0f);
case Type::et_mil_val:
if (value == 0x8000U) { // "not available"
return NAN;
}
return (static_cast<std::int16_t>(value) / 1000.0f);
case Type::et_little_endian:
return static_cast<float>((((value >> 8U) & 0xFF) | ((value & 0xff) << 8U)));
Expand Down Expand Up @@ -96,6 +107,9 @@ SimpleVariant GetValueByType(const std::uint16_t value, const Type type) {
case Type::et_double_val:
[[fallthrough]];
case Type::et_triple_val:
if (value == 0x8000U) { // "not available"
return NAN;
}
return static_cast<std::int16_t>(value) * 1.0f;
case Type::et_default:
[[fallthrough]];
Expand Down
Loading