kopia lustrzana https://github.com/weetmuts/wmbusmeters
Added smoke meter ei6500.
Fredrik Öhrström
rodzic
0467967485
commit
36ca71d353
2
CHANGES
2
CHANGES
|
|
@ -1,4 +1,6 @@
|
|||
|
||||
Rattinca helped add support for the EI Electronics smoke detector. Thanks Rattinca!
|
||||
|
||||
Ignore duplicates is now enabled by default. Turn it off with --ignoreduplicates=false
|
||||
|
||||
Fixed problem with state maintaining meter drivers and wildcard ids.
|
||||
|
|
|
|||
1
Makefile
1
Makefile
|
|
@ -158,6 +158,7 @@ METER_OBJS:=\
|
|||
$(BUILD)/meter_hydrus.o \
|
||||
$(BUILD)/meter_hydrocalm3.o \
|
||||
$(BUILD)/meter_hydrodigit.o \
|
||||
$(BUILD)/meter_ei6500.o \
|
||||
$(BUILD)/meter_iperl.o \
|
||||
$(BUILD)/meter_izar.o \
|
||||
$(BUILD)/meter_izar3.o \
|
||||
|
|
|
|||
|
|
@ -301,6 +301,7 @@ Lansen Thermometer/Hygrometer (lansenth)
|
|||
|
||||
Supported smoke detectors:
|
||||
Lansen Smoke Detector (lansensm)
|
||||
Ei Electronics Smoke Detector ei6500-oms (ei6500)
|
||||
|
||||
Supported door/window detectors:
|
||||
Lansen Door/Window Detector (lansendw)
|
||||
|
|
|
|||
119
src/dvparser.cc
119
src/dvparser.cc
|
|
@ -584,6 +584,125 @@ bool extractDVdouble(map<string,pair<int,DVEntry>> *values,
|
|||
return true;
|
||||
}
|
||||
|
||||
bool extractDVlong(map<string,pair<int,DVEntry>> *values,
|
||||
string key,
|
||||
int *offset,
|
||||
uint64_t *value)
|
||||
{
|
||||
if ((*values).count(key) == 0) {
|
||||
verbose("(dvparser) warning: cannot extract long from non-existant key \"%s\"\n", key.c_str());
|
||||
*offset = 0;
|
||||
*value = 0;
|
||||
return false;
|
||||
}
|
||||
uchar dif, vif;
|
||||
extractDV(key, &dif, &vif);
|
||||
|
||||
pair<int,DVEntry>& p = (*values)[key];
|
||||
*offset = p.first;
|
||||
|
||||
if (p.second.value.length() == 0) {
|
||||
verbose("(dvparser) warning: key found but no data \"%s\"\n", key.c_str());
|
||||
*offset = 0;
|
||||
*value = 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
int t = dif&0xf;
|
||||
if (t == 0x1 || // 8 Bit Integer/Binary
|
||||
t == 0x2 || // 16 Bit Integer/Binary
|
||||
t == 0x3 || // 24 Bit Integer/Binary
|
||||
t == 0x4 || // 32 Bit Integer/Binary
|
||||
t == 0x6 || // 48 Bit Integer/Binary
|
||||
t == 0x7) // 64 Bit Integer/Binary
|
||||
{
|
||||
vector<uchar> v;
|
||||
hex2bin(p.second.value, &v);
|
||||
uint64_t raw = 0;
|
||||
if (t == 0x1) {
|
||||
assert(v.size() == 1);
|
||||
raw = v[0];
|
||||
} else if (t == 0x2) {
|
||||
assert(v.size() == 2);
|
||||
raw = v[1]*256 + v[0];
|
||||
} else if (t == 0x3) {
|
||||
assert(v.size() == 3);
|
||||
raw = v[2]*256*256 + v[1]*256 + v[0];
|
||||
} else if (t == 0x4) {
|
||||
assert(v.size() == 4);
|
||||
raw = ((unsigned int)v[3])*256*256*256
|
||||
+ ((unsigned int)v[2])*256*256
|
||||
+ ((unsigned int)v[1])*256
|
||||
+ ((unsigned int)v[0]);
|
||||
} else if (t == 0x6) {
|
||||
assert(v.size() == 6);
|
||||
raw = ((uint64_t)v[5])*256*256*256*256*256
|
||||
+ ((uint64_t)v[4])*256*256*256*256
|
||||
+ ((uint64_t)v[3])*256*256*256
|
||||
+ ((uint64_t)v[2])*256*256
|
||||
+ ((uint64_t)v[1])*256
|
||||
+ ((uint64_t)v[0]);
|
||||
} else if (t == 0x7) {
|
||||
assert(v.size() == 8);
|
||||
raw = ((uint64_t)v[7])*256*256*256*256*256*256*256
|
||||
+ ((uint64_t)v[6])*256*256*256*256*256*256
|
||||
+ ((uint64_t)v[5])*256*256*256*256*256
|
||||
+ ((uint64_t)v[4])*256*256*256*256
|
||||
+ ((uint64_t)v[3])*256*256*256
|
||||
+ ((uint64_t)v[2])*256*256
|
||||
+ ((uint64_t)v[1])*256
|
||||
+ ((uint64_t)v[0]);
|
||||
}
|
||||
*value = raw;
|
||||
}
|
||||
else
|
||||
if (t == 0x9 || // 2 digit BCD
|
||||
t == 0xA || // 4 digit BCD
|
||||
t == 0xB || // 6 digit BCD
|
||||
t == 0xC || // 8 digit BCD
|
||||
t == 0xE) // 12 digit BCD
|
||||
{
|
||||
// 74140000 -> 00001474
|
||||
string& v = p.second.value;
|
||||
uint64_t raw = 0;
|
||||
if (t == 0x9) {
|
||||
assert(v.size() == 2);
|
||||
raw = (v[0]-'0')*10 + (v[1]-'0');
|
||||
} else if (t == 0xA) {
|
||||
assert(v.size() == 4);
|
||||
raw = (v[2]-'0')*10*10*10 + (v[3]-'0')*10*10
|
||||
+ (v[0]-'0')*10 + (v[1]-'0');
|
||||
} else if (t == 0xB) {
|
||||
assert(v.size() == 6);
|
||||
raw = (v[4]-'0')*10*10*10*10*10 + (v[5]-'0')*10*10*10*10
|
||||
+ (v[2]-'0')*10*10*10 + (v[3]-'0')*10*10
|
||||
+ (v[0]-'0')*10 + (v[1]-'0');
|
||||
} else if (t == 0xC) {
|
||||
assert(v.size() == 8);
|
||||
raw = (v[6]-'0')*10*10*10*10*10*10*10 + (v[7]-'0')*10*10*10*10*10*10
|
||||
+ (v[4]-'0')*10*10*10*10*10 + (v[5]-'0')*10*10*10*10
|
||||
+ (v[2]-'0')*10*10*10 + (v[3]-'0')*10*10
|
||||
+ (v[0]-'0')*10 + (v[1]-'0');
|
||||
} else if (t == 0xE) {
|
||||
assert(v.size() == 12);
|
||||
raw =(v[10]-'0')*10*10*10*10*10*10*10*10*10*10*10 + (v[11]-'0')*10*10*10*10*10*10*10*10*10*10
|
||||
+ (v[8]-'0')*10*10*10*10*10*10*10*10*10 + (v[9]-'0')*10*10*10*10*10*10*10*10
|
||||
+ (v[6]-'0')*10*10*10*10*10*10*10 + (v[7]-'0')*10*10*10*10*10*10
|
||||
+ (v[4]-'0')*10*10*10*10*10 + (v[5]-'0')*10*10*10*10
|
||||
+ (v[2]-'0')*10*10*10 + (v[3]-'0')*10*10
|
||||
+ (v[0]-'0')*10 + (v[1]-'0');
|
||||
}
|
||||
|
||||
*value = raw;
|
||||
}
|
||||
else
|
||||
{
|
||||
error("Unsupported dif format for extraction to long! dif=%02x\n", dif);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool extractDVstring(map<string,pair<int,DVEntry>> *values,
|
||||
string key,
|
||||
int *offset,
|
||||
|
|
|
|||
|
|
@ -97,13 +97,19 @@ bool extractDVuint32(std::map<std::string,std::pair<int,DVEntry>> *values,
|
|||
int *offset,
|
||||
uint32_t *value);
|
||||
|
||||
// All volume values are scaled to cubic meters, m3.
|
||||
// All values are scaled according to the vif and wmbusmeters scaling defaults.
|
||||
bool extractDVdouble(std::map<std::string,std::pair<int,DVEntry>> *values,
|
||||
std::string key,
|
||||
int *offset,
|
||||
double *value,
|
||||
bool auto_scale = true);
|
||||
|
||||
// Extract a value without scaling. Works for 8bits to 64 bits, binary and bcd.
|
||||
bool extractDVlong(map<string,pair<int,DVEntry>> *values,
|
||||
string key,
|
||||
int *offset,
|
||||
uint64_t *value);
|
||||
|
||||
bool extractDVstring(std::map<std::string,std::pair<int,DVEntry>> *values,
|
||||
std::string key,
|
||||
int *offset,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,308 @@
|
|||
/*
|
||||
Copyright (C) 2020 Fredrik Öhrström
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include"dvparser.h"
|
||||
#include"meters.h"
|
||||
#include"meters_common_implementation.h"
|
||||
#include"wmbus.h"
|
||||
#include"wmbus_utils.h"
|
||||
#include"string.h"
|
||||
|
||||
#define INFO_INSTALLATION_COMPLETED 0x0001
|
||||
#define INFO_ENVIRONMENT_CHANGED 0x0002
|
||||
#define INFO_REMOVED 0x0040
|
||||
#define INFO_LOW_BATTERY 0x0080
|
||||
#define INFO_OBSTACLE_DETECTED 0x0100
|
||||
#define INFO_COVERING_DETECTED 0x0200
|
||||
|
||||
struct MeterEI6500 : public virtual SmokeDetector, public virtual MeterCommonImplementation
|
||||
{
|
||||
MeterEI6500(MeterInfo &mi);
|
||||
|
||||
string status();
|
||||
bool smokeDetected();
|
||||
string messageDate();
|
||||
string commissionDate();
|
||||
string lastSounderTestDate();
|
||||
string lastAlarmDate();
|
||||
string smokeAlarmCounter();
|
||||
string removedCounter();
|
||||
string totalRemoveDuration();
|
||||
string lastRemoveDate();
|
||||
string testButtonCounter();
|
||||
string testButtonLastDate();
|
||||
|
||||
private:
|
||||
|
||||
void processContent(Telegram *t);
|
||||
|
||||
private:
|
||||
|
||||
string software_version_;
|
||||
string message_datetime_ {};
|
||||
uint8_t tpl_sts_ {};
|
||||
uint16_t info_codes_ {};
|
||||
|
||||
uint16_t smoke_alarm_counter_ {};
|
||||
string last_alarm_date_ {};
|
||||
uint32_t total_remove_duration_ {};
|
||||
string last_remove_date_ {};
|
||||
string test_button_last_date_ {};
|
||||
uint16_t removed_counter_ {};
|
||||
uint16_t test_button_counter_ {};
|
||||
|
||||
map<int,string> error_codes_;
|
||||
};
|
||||
|
||||
MeterEI6500::MeterEI6500(MeterInfo &mi) :
|
||||
MeterCommonImplementation(mi, MeterType::EI6500)
|
||||
{
|
||||
setExpectedTPLSecurityMode(TPLSecurityMode::AES_CBC_IV);
|
||||
|
||||
addLinkMode(LinkMode::C1);
|
||||
|
||||
// Vendor specific errors sent through the tpl status byte.
|
||||
/*
|
||||
error_codes_ = { { 0x10, "XXX" },
|
||||
{ 0x20, "YYY" },
|
||||
{ 0x30, "ZZZ" },
|
||||
{ 0xf0, "WWW" } };*/
|
||||
|
||||
addPrint("software_version", Quantity::Text,
|
||||
[&](){ return software_version_; },
|
||||
"Software version.",
|
||||
false, true);
|
||||
addPrint("message_datetime", Quantity::Text,
|
||||
[&](){ return messageDate(); },
|
||||
"Date of message.",
|
||||
false, true);
|
||||
addPrint("last_alarm_date", Quantity::Text,
|
||||
[&](){ return lastAlarmDate(); },
|
||||
"Date of last alarm.",
|
||||
true, true);
|
||||
addPrint("smoke_alarm_counter", Quantity::Text,
|
||||
[&](){ return smokeAlarmCounter(); },
|
||||
"Number of times smoke alarm was triggered.",
|
||||
true, true);
|
||||
addPrint("total_remove_duration", Quantity::Text,
|
||||
[&](){ return totalRemoveDuration(); },
|
||||
"Number of times it was removed.",
|
||||
true, true);
|
||||
addPrint("last_remove_date", Quantity::Text,
|
||||
[&](){ return lastRemoveDate(); },
|
||||
"Date of last removal.",
|
||||
true, true);
|
||||
addPrint("removed_counter", Quantity::Text,
|
||||
[&](){ return removedCounter(); },
|
||||
"removed counter",
|
||||
true, true);
|
||||
addPrint("test_button_last_date", Quantity::Text,
|
||||
[&](){ return testButtonLastDate(); },
|
||||
"Date of last test button press.",
|
||||
true, true);
|
||||
addPrint("test_button_counter", Quantity::Text,
|
||||
[&](){ return testButtonCounter(); },
|
||||
"test button counter",
|
||||
true, true);
|
||||
addPrint("status", Quantity::Text,
|
||||
[&](){ return status(); },
|
||||
"Status of smoke detector.",
|
||||
true, true);
|
||||
}
|
||||
|
||||
shared_ptr<SmokeDetector> createEI6500(MeterInfo &mi)
|
||||
{
|
||||
return shared_ptr<SmokeDetector>(new MeterEI6500(mi));
|
||||
}
|
||||
|
||||
bool MeterEI6500::smokeDetected()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void MeterEI6500::processContent(Telegram *t)
|
||||
{
|
||||
/*
|
||||
(ei6500) 11: 0B dif (6 digit BCD Instantaneous value)
|
||||
(ei6500) 12: FD vif (Second extension FD of VIF-codes)
|
||||
(ei6500) 13: 0F vife (Software version #)
|
||||
(ei6500) 14: * 060101 software version (1.1.6)
|
||||
(ei6500) 17: 04 dif (32 Bit Integer/Binary Instantaneous value)
|
||||
(ei6500) 18: 6D vif (Date and time type)
|
||||
(ei6500) 19: * 300CAB22 message datetime (2021-02-11 12:48)
|
||||
(ei6500) 1d: 02 dif (16 Bit Integer/Binary Instantaneous value)
|
||||
(ei6500) 1e: FD vif (Second extension FD of VIF-codes)
|
||||
(ei6500) 1f: 17 vife (Error flags (binary))
|
||||
(ei6500) 20: * 0000 info codes (148ce5d8)
|
||||
(ei6500) 22: 82 dif (16 Bit Integer/Binary Instantaneous value)
|
||||
(ei6500) 23: 20 dife (subunit=0 tariff=2 storagenr=0)
|
||||
(ei6500) 24: 6C vif (Date type G)
|
||||
(ei6500) 25: AB22
|
||||
(ei6500) 27: 42 dif (16 Bit Integer/Binary Instantaneous value storagenr=1)
|
||||
(ei6500) 28: 6C vif (Date type G)
|
||||
(ei6500) 29: 0101
|
||||
(ei6500) 2b: 84 dif (32 Bit Integer/Binary Instantaneous value)
|
||||
(ei6500) 2c: 40 dife (subunit=1 tariff=0 storagenr=0)
|
||||
(ei6500) 2d: FF vif (Vendor extension)
|
||||
(ei6500) 2e: 2C vife (per litre)
|
||||
(ei6500) 2f: 000F1100
|
||||
(ei6500) 33: 82 dif (16 Bit Integer/Binary Instantaneous value)
|
||||
(ei6500) 34: 50 dife (subunit=1 tariff=1 storagenr=0)
|
||||
(ei6500) 35: FD vif (Second extension FD of VIF-codes)
|
||||
(ei6500) 36: 61 vife (Cumulation counter)
|
||||
(ei6500) 37: * 0000 smoke alarm counter (0)
|
||||
(ei6500) 39: 82 dif (16 Bit Integer/Binary Instantaneous value)
|
||||
(ei6500) 3a: 50 dife (subunit=1 tariff=1 storagenr=0)
|
||||
(ei6500) 3b: 6C vif (Date type G)
|
||||
(ei6500) 3c: * 0101 last alarm date (2000-01-01)
|
||||
(ei6500) 3e: 82 dif (16 Bit Integer/Binary Instantaneous value)
|
||||
(ei6500) 3f: 60 dife (subunit=1 tariff=2 storagenr=0)
|
||||
(ei6500) 40: FD vif (Second extension FD of VIF-codes)
|
||||
(ei6500) 41: 61 vife (Cumulation counter)
|
||||
(ei6500) 42: * 0000 removed counter (0)
|
||||
(ei6500) 44: 83 dif (24 Bit Integer/Binary Instantaneous value)
|
||||
(ei6500) 45: 60 dife (subunit=1 tariff=2 storagenr=0)
|
||||
(ei6500) 46: FD vif (Second extension FD of VIF-codes)
|
||||
(ei6500) 47: 31 vife (Duration of tariff [minute(s)])
|
||||
(ei6500) 48: * 000000 total remove duration (0)
|
||||
(ei6500) 4b: 82 dif (16 Bit Integer/Binary Instantaneous value)
|
||||
(ei6500) 4c: 60 dife (subunit=1 tariff=2 storagenr=0)
|
||||
(ei6500) 4d: 6C vif (Date type G)
|
||||
(ei6500) 4e: * 0101 last remove date (2000-01-01)
|
||||
(ei6500) 50: 82 dif (16 Bit Integer/Binary Instantaneous value)
|
||||
(ei6500) 51: 70 dife (subunit=1 tariff=3 storagenr=0)
|
||||
(ei6500) 52: FD vif (Second extension FD of VIF-codes)
|
||||
(ei6500) 53: 61 vife (Cumulation counter)
|
||||
(ei6500) 54: * 0100 test button counter (1)
|
||||
(ei6500) 56: 82 dif (16 Bit Integer/Binary Instantaneous value)
|
||||
(ei6500) 57: 70 dife (subunit=1 tariff=3 storagenr=0)
|
||||
(ei6500) 58: 6C vif (Date type G)
|
||||
(ei6500) 59: * AB22 test button last date (2021-02-11)
|
||||
*/
|
||||
int offset;
|
||||
|
||||
tpl_sts_ = t->tpl_sts;
|
||||
|
||||
uint64_t serial;
|
||||
if (extractDVlong(&t->values, "0BFD0F", &offset, &serial))
|
||||
{
|
||||
// 060101 --> 01.01.06
|
||||
software_version_ =
|
||||
to_string((serial/10000)%100)+"."+
|
||||
to_string((serial/100)%100)+"."+
|
||||
to_string((serial)%100);
|
||||
t->addMoreExplanation(offset, " software version (%s)", software_version_.c_str());
|
||||
}
|
||||
|
||||
struct tm datetime;
|
||||
if (extractDVdate(&t->values, "046D", &offset, &datetime))
|
||||
{
|
||||
message_datetime_ = strdatetime(&datetime);
|
||||
t->addMoreExplanation(offset, " message datetime (%s)", message_datetime_.c_str());
|
||||
}
|
||||
|
||||
if (extractDVuint16(&t->values, "02FD17", &offset, &info_codes_))
|
||||
{
|
||||
string s = status();
|
||||
t->addMoreExplanation(offset, " info codes (%x)", s.c_str());
|
||||
}
|
||||
|
||||
extractDVdate(&t->values, "82506C", &offset, &datetime);
|
||||
last_alarm_date_ = strdate(&datetime);
|
||||
t->addMoreExplanation(offset, " last alarm date (%s)", last_alarm_date_.c_str());
|
||||
|
||||
extractDVuint16(&t->values, "8250FD61", &offset, &smoke_alarm_counter_);
|
||||
t->addMoreExplanation(offset, " smoke alarm counter (%zu)", smoke_alarm_counter_);
|
||||
|
||||
extractDVuint16(&t->values, "8260FD61", &offset, &removed_counter_);
|
||||
t->addMoreExplanation(offset, " removed counter (%zu)", removed_counter_);
|
||||
|
||||
extractDVuint16(&t->values, "8270FD61", &offset, &test_button_counter_);
|
||||
t->addMoreExplanation(offset, " test button counter (%zu)", test_button_counter_);
|
||||
|
||||
extractDVuint24(&t->values, "8360FD31", &offset, &total_remove_duration_);
|
||||
t->addMoreExplanation(offset, " total remove duration (%zu)", total_remove_duration_);
|
||||
|
||||
extractDVdate(&t->values, "82606C", &offset, &datetime);
|
||||
last_remove_date_ = strdate(&datetime);
|
||||
t->addMoreExplanation(offset, " last remove date (%s)", last_remove_date_.c_str());
|
||||
|
||||
extractDVdate(&t->values, "82706C", &offset, &datetime);
|
||||
test_button_last_date_ = strdate(&datetime);
|
||||
t->addMoreExplanation(offset, " test button last date (%s)", test_button_last_date_.c_str());
|
||||
}
|
||||
|
||||
string MeterEI6500::status()
|
||||
{
|
||||
string s = decodeTPLStatusByte(tpl_sts_, &error_codes_);
|
||||
|
||||
if (s == "OK") s = ""; else s += " ";
|
||||
|
||||
if ((info_codes_ & INFO_INSTALLATION_COMPLETED) == 0) s.append("NOT_INSTALLED ");
|
||||
if (info_codes_ & INFO_ENVIRONMENT_CHANGED) s.append("ENVIRONMENT_CHANGED ");
|
||||
if (info_codes_ & INFO_REMOVED) s.append("REMOVED ");
|
||||
if (info_codes_ & INFO_OBSTACLE_DETECTED) s.append("OBSTACLE_DETECTED ");
|
||||
if (info_codes_ & INFO_COVERING_DETECTED) s.append("COVERING_DETECTED ");
|
||||
|
||||
if (s.length() > 0)
|
||||
{
|
||||
// There is something to report!
|
||||
s.pop_back(); // Remove final space
|
||||
return s;
|
||||
}
|
||||
return "OK";
|
||||
}
|
||||
|
||||
string MeterEI6500::messageDate()
|
||||
{
|
||||
return message_datetime_;
|
||||
}
|
||||
|
||||
string MeterEI6500::lastAlarmDate()
|
||||
{
|
||||
return last_alarm_date_;
|
||||
}
|
||||
|
||||
string MeterEI6500::totalRemoveDuration()
|
||||
{
|
||||
return to_string(total_remove_duration_) + " minutes";
|
||||
}
|
||||
|
||||
string MeterEI6500::smokeAlarmCounter()
|
||||
{
|
||||
return to_string(smoke_alarm_counter_);
|
||||
}
|
||||
|
||||
string MeterEI6500::testButtonCounter()
|
||||
{
|
||||
return to_string(test_button_counter_);
|
||||
}
|
||||
|
||||
string MeterEI6500::removedCounter()
|
||||
{
|
||||
return to_string(removed_counter_);
|
||||
}
|
||||
|
||||
string MeterEI6500::lastRemoveDate()
|
||||
{
|
||||
return last_remove_date_;
|
||||
}
|
||||
|
||||
string MeterEI6500::testButtonLastDate()
|
||||
{
|
||||
return test_button_last_date_;
|
||||
}
|
||||
|
|
@ -465,7 +465,7 @@ void MeterHydrus::processContent(Telegram *t)
|
|||
t->addMoreExplanation(offset, " battery life (%d days %f years)", days, remaining_battery_life_year_);
|
||||
}
|
||||
|
||||
status_ = decodeTPLStatusByte(t->tpl_sts, error_codes_);
|
||||
status_ = decodeTPLStatusByte(t->tpl_sts, &error_codes_);
|
||||
}
|
||||
|
||||
double MeterHydrus::totalWaterConsumption(Unit u)
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ void MeterWaterstarM::processContent(Telegram *t)
|
|||
}
|
||||
|
||||
extractDVuint16(&t->values, "02FD17", &offset, &info_codes_);
|
||||
status_ = decodeTPLStatusByte(info_codes_, error_codes_);
|
||||
status_ = decodeTPLStatusByte(info_codes_, &error_codes_);
|
||||
t->addMoreExplanation(offset, " info codes (%s)", status_.c_str());
|
||||
|
||||
extractDVdouble(&t->values, "04933C", &offset, &total_water_backwards_m3_);
|
||||
|
|
|
|||
10
src/meters.h
10
src/meters.h
|
|
@ -77,10 +77,11 @@
|
|||
X(vario451, T1_bit, HeatMeter, VARIO451, Vario451) \
|
||||
X(waterstarm, C1_bit|T1_bit, WaterMeter,WATERSTARM, WaterstarM) \
|
||||
X(whe46x, S1_bit, HeatCostAllocationMeter, WHE46X, Whe46x) \
|
||||
X(whe5x, S1_bit, HeatCostAllocationMeter, WHE5X, Whe5x) \
|
||||
X(topaseskr, T1_bit, WaterMeter, TOPASESKR, TopasEsKr) \
|
||||
X(sensostar, C1_bit|T1_bit, HeatMeter,SENSOSTAR, Sensostar) \
|
||||
X(gransystems,T1_bit, ElectricityMeter, CCx01, CCx01)
|
||||
X(whe5x, S1_bit, HeatCostAllocationMeter, WHE5X, Whe5x) \
|
||||
X(topaseskr, T1_bit, WaterMeter, TOPASESKR, TopasEsKr) \
|
||||
X(sensostar, C1_bit|T1_bit, HeatMeter,SENSOSTAR, Sensostar) \
|
||||
X(gransystems,T1_bit, ElectricityMeter, CCx01, CCx01) \
|
||||
X(ei6500, C1_bit, SmokeDetector, EI6500, EI6500)
|
||||
|
||||
|
||||
// List of numbers that can be used to detect the meter driver from a telegram.
|
||||
|
|
@ -120,6 +121,7 @@
|
|||
X(HYDRUS, MANUFACTURER_DME, 0x16, 0x70) \
|
||||
X(HYDROCALM3,MANUFACTURER_BMT, 0x0d, 0x0b) \
|
||||
X(HYDRODIGIT,MANUFACTURER_BMT, 0x07, 0x13) \
|
||||
X(EI6500, MANUFACTURER_EIE, 0x1a, 0x0c) \
|
||||
X(IPERL, MANUFACTURER_SEN, 0x06, 0x68) \
|
||||
X(IPERL, MANUFACTURER_SEN, 0x07, 0x68) \
|
||||
X(IPERL, MANUFACTURER_SEN, 0x07, 0x7c) \
|
||||
|
|
|
|||
|
|
@ -1289,7 +1289,7 @@ bool Telegram::parseShortTPL(std::vector<uchar>::iterator &pos)
|
|||
|
||||
CHECK(1);
|
||||
tpl_sts = *pos;
|
||||
addExplanationAndIncrementPos(pos, 1, "%02x tpl-sts-field", tpl_sts);
|
||||
addExplanationAndIncrementPos(pos, 1, "%02x tpl-sts-field (%s)", tpl_sts, decodeTPLStatusByte(tpl_sts, NULL).c_str());
|
||||
|
||||
bool ok = parseTPLConfig(pos);
|
||||
if (!ok) return false;
|
||||
|
|
@ -4245,7 +4245,7 @@ FrameStatus checkMBusFrame(vector<uchar> &data,
|
|||
return FullFrame;
|
||||
}
|
||||
|
||||
string decodeTPLStatusByte(uchar sts, map<int,string> vendor_lookup)
|
||||
string decodeTPLStatusByte(uchar sts, map<int,string> *vendor_lookup)
|
||||
{
|
||||
string s;
|
||||
|
||||
|
|
@ -4262,9 +4262,9 @@ string decodeTPLStatusByte(uchar sts, map<int,string> vendor_lookup)
|
|||
{
|
||||
// Vendor specific bits are set, lets translate them.
|
||||
int v = sts & 0xf8; // Zero the 3 lowest bits.
|
||||
if (vendor_lookup.count(v) != 0)
|
||||
if (vendor_lookup != NULL && vendor_lookup->count(v) != 0)
|
||||
{
|
||||
s += vendor_lookup[v];
|
||||
s += (*vendor_lookup)[v];
|
||||
s += " ";
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -422,6 +422,8 @@ struct Telegram
|
|||
int tpl_ci {}; // 1 byte
|
||||
int tpl_acc {}; // 1 byte
|
||||
int tpl_sts {}; // 1 byte
|
||||
int tpl_sts_offset {}; // Remember where the sts field is in the telegram, so
|
||||
// that we can add more vendor specific decodings to it.
|
||||
int tpl_cfg {}; // 2 bytes
|
||||
TPLSecurityMode tpl_sec_mode {}; // Based on 5 bits extracted from cfg.
|
||||
int tpl_num_encr_blocks {};
|
||||
|
|
@ -629,11 +631,7 @@ string formatData(int dif, int vif, int vife, string data);
|
|||
|
||||
// Decode the status byte in the TPL with a map that gives the
|
||||
// translations for the 3 vendor specific high bits.
|
||||
string decodeTPLStatusByte(uchar sts, std::map<int,std::string> vendor_lookup);
|
||||
|
||||
double extract8bitAsDouble(int dif, int vif, int vife, string data);
|
||||
double extract16bitAsDouble(int dif, int vif, int vife, string data);
|
||||
double extract32bitAsDouble(int dif, int vif, int vife, string data);
|
||||
string decodeTPLStatusByte(uchar sts, std::map<int,std::string> *vendor_lookup);
|
||||
|
||||
int difLenBytes(int dif);
|
||||
MeasurementType difMeasurementType(int dif);
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue