mirror
/
wmbusmeters
kopia lustrzana https://github.com/weetmuts/wmbusmeters
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Added initial support for RFM-AMB meter.

pull/42/head
weetmuts 2019-10-14 20:26:31 +02:00
rodzic 55a2cac3a8
commit 17e5e33124
20 zmienionych plików z 477 dodań i 38 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
Makefile
Wyświetl plik

@ -103,6 +103,7 @@ METER_OBJS:=\
$(BUILD)/meter_mkradio3.o \
$(BUILD)/meter_vario451.o \
$(BUILD)/meter_lansenth.o \
$(BUILD)/meter_rfmamb.o \
$(BUILD)/printer.o \
$(BUILD)/serial.o \
$(BUILD)/shell.o \

7
simulations/simulation_t1.txt
Wyświetl plik

@ -49,7 +49,12 @@ telegram=|374468506549235827C3A2|129F25383300A8622600008200800A2AF86211517555287
telegram=|7644C52501880188550872|01880188C5255508010000002F2F0B6E332211426E110182016E1102C2016E110382026E1104C2026E110582036E1106C2036E110782046E1108C2046E110982056E1110C2056E111182066E1112C2066E111382076E1114C2076E111582086E1116C2086E111702FD172100|
{"media":"heat cost allocation","meter":"eurisii","name":"HeatMeter","id":"88018801","current_consumption_hca":112233,"set_date":"","consumption_at_set_date_hca":273,"consumption_at_set_date_1_hca":273,"consumption_at_set_date_2_hca":529,"consumption_at_set_date_3_hca":785,"consumption_at_set_date_4_hca":1041,"consumption_at_set_date_5_hca":1297,"consumption_at_set_date_6_hca":1553,"consumption_at_set_date_7_hca":1809,"consumption_at_set_date_8_hca":2065,"consumption_at_set_date_9_hca":2321,"consumption_at_set_date_10_hca":4113,"consumption_at_set_date_11_hca":4369,"consumption_at_set_date_12_hca":4625,"consumption_at_set_date_13_hca":4881,"consumption_at_set_date_14_hca":5137,"consumption_at_set_date_15_hca":5393,"consumption_at_set_date_16_hca":5649,"consumption_at_set_date_17_hca":5905,"error_flags":"MEASUREMENT RESET","timestamp":"1111-11-11T11:11:11Z"}
# Test Lansen Temperature Hygrometer telegrsm
# Test Lansen Temperature Hygrometer telegram
telegram=|2e44333003020100071b7a634820252f2f0265840842658308820165950802fb1aae0142fb1aae018201fb1aa9012f|
{"media":"room sensor","meter":"lansenth","name":"Tempoo","id":"00010203","current_temperature_c":21.8,"current_relative_humidity_rh":43,"temperature_at_set_date_1_c":21.79,"relative_humidity_at_set_date_1_rh":43,"temperature_at_set_date_2_c":21.97,"relative_humidity_at_set_date_2_rh":42.5,"timestamp":"1111-11-11T11:11:11Z"}
# Test BMEters RFM-AMB Temperature Hygrometer telegram
telegram=|5744b40988227711101b7ab20800000265a00842658f088201659f08226589081265a0086265510852652b0902fb1aba0142fb1ab0018201fb1abd0122fb1aa90112fb1aba0162fb1aa60152fb1af501066d3b3bb36b2a00|
{"media":"room sensor","meter":"rfmamb","name":"Rummet","id":"11772288","current_temperature_c":22.08,"maximum_temperature_c":22.08,"minimum_temperature_c":21.85,"maximum_temperature_at_set_date_1_c":23.47,"minimum_temperature_at_set_date_1_c":21.29,"current_relative_humidity_rh":44.2,"minimum_relative_humidity_rh":42.5,"maximum_relative_humidity_rh":44.2,"maximum_relative_humidity_at_set_date_1_rh":50.1,"minimum_relative_humidity_at_set_date_1_rh":42.2,"temperature_at_set_date_1_c":21.91,"relative_humidity_at_set_date_1_rh":43.2,"temperature_at_set_date_2_c":22.07,"relative_humidity_at_set_date_2_rh":44.5,"device_date_time":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z"}

24
src/dvparser.cc
Wyświetl plik

@ -122,8 +122,10 @@ bool parseDV(Telegram *t,
if (*format == format_end) break;
uchar dif = **format;
MeasurementType mt = difMeasurementType(dif);
int datalen = difLenBytes(dif);
DEBUG_PARSER("(dvparser debug) dif=%02x datalen=%d \"%s\"\n", dif, datalen, difType(dif).c_str());
DEBUG_PARSER("(dvparser debug) dif=%02x datalen=%d \"%s\" type=%s\n", dif, datalen, difType(dif).c_str(),
measurementTypeName(mt).c_str());
if (datalen == -2) {
debug("(dvparser) cannot handle dif %02X ignoring rest of telegram.\n\n", dif);
break;
@ -249,7 +251,7 @@ bool parseDV(Telegram *t,
}
string value = bin2hex(data, data_end, datalen);
int offset = start_parse_here+data-data_start;
(*values)[key] = { offset, DVEntry(vif&0x7f, storage_nr, tariff, subunit, value) };
(*values)[key] = { offset, DVEntry(mt, vif&0x7f, storage_nr, tariff, subunit, value) };
if (value.length() > 0) {
// This call increments data with datalen.
t->addExplanation(data, datalen, "%s", value.c_str());
@ -288,19 +290,29 @@ bool hasKey(std::map<std::string,std::pair<int,DVEntry>> *values, std::string ke
return values->count(key) > 0;
}
bool findKey(ValueInformation vif, int storagenr, std::string *key, std::map<std::string,std::pair<int,DVEntry>> *values)
bool findKey(MeasurementType mit, ValueInformation vif, int storagenr, std::string *key, std::map<std::string,std::pair<int,DVEntry>> *values)
{
int low, hi;
valueInfoRange(vif, &low, &hi);
debug("(dvparser) looking for type=%s vif=%s storagenr=%d\n",
measurementTypeName(mit).c_str(), ValueInformationName(vif), storagenr);
for (auto& v : *values)
{
MeasurementType ty = v.second.second.type;
int vi = v.second.second.value_information;
int sn = v.second.second.storagenr;
if (vi >= low && vi <= hi && (storagenr == ANY_STORAGENR || storagenr == sn)) {
debug("(dvparser) match? type=%s vif=%s and storagenr=%d\n",
measurementTypeName(ty).c_str(), ValueInformationName(vif), storagenr, sn);
if (vi >= low && vi <= hi
&& (mit == MeasurementType::Unknown || mit == ty)
&& (storagenr == ANY_STORAGENR || storagenr == sn))
{
*key = v.first;
debug("(dvparser) found key %s for %s and storagenr=%d\n",
v.first.c_str(), ValueInformationName(vif), storagenr);
debug("(dvparser) found key %s for type=%s vif=%s storagenr=%d\n",
v.first.c_str(), measurementTypeName(ty).c_str(), ValueInformationName(vif), storagenr);
return true;
}
}

7
src/dvparser.h
Wyświetl plik

@ -49,6 +49,7 @@ const char *ValueInformatioName(ValueInformation v);
struct DVEntry
{
MeasurementType type {};
int value_information {};
int storagenr {};
int tariff {};
@ -56,8 +57,8 @@ struct DVEntry
string value;
DVEntry() {}
DVEntry(int vi, int st, int ta, int su, string &val) :
value_information(vi), storagenr(st), tariff(ta), subunit(su), value(val) {}
DVEntry(MeasurementType mt, int vi, int st, int ta, int su, string &val) :
type(mt), value_information(vi), storagenr(st), tariff(ta), subunit(su), value(val) {}
};
bool loadFormatBytesFromSignature(uint16_t format_signature, vector<uchar> *format_bytes);
@ -75,7 +76,7 @@ bool parseDV(Telegram *t,
// find an existing difvif entry in the values based on the desired value information type.
// Like: Volume, VolumeFlow, FlowTemperature, ExternalTemperature etc
// in combination with the storagenr. (Later I will add tariff/subunit)
bool findKey(ValueInformation vi, int storagenr, std::string *key, std::map<std::string,std::pair<int,DVEntry>> *values);
bool findKey(MeasurementType mt, ValueInformation vi, int storagenr, std::string *key, std::map<std::string,std::pair<int,DVEntry>> *values);
#define ANY_STORAGENR -1
bool hasKey(std::map<std::string,std::pair<int,DVEntry>> *values, std::string key);

6
src/meter_amiplus.cc
Wyświetl plik

@ -125,12 +125,12 @@ void MeterAmiplus::processContent(Telegram *t)
int offset;
string key;
if (findKey(ValueInformation::EnergyWh, 0, &key, &values)) {
if (findKey(MeasurementType::Unknown, ValueInformation::EnergyWh, 0, &key, &values)) {
extractDVdouble(&values, key, &offset, &total_energy_kwh_);
t->addMoreExplanation(offset, " total energy (%f kwh)", total_energy_kwh_);
}
if (findKey(ValueInformation::PowerW, 0, &key, &values)) {
if (findKey(MeasurementType::Unknown, ValueInformation::PowerW, 0, &key, &values)) {
extractDVdouble(&values, key, &offset, &current_power_kw_);
t->addMoreExplanation(offset, " current power (%f kw)", current_power_kw_);
}
@ -141,7 +141,7 @@ void MeterAmiplus::processContent(Telegram *t)
extractDVdouble(&values, "0BAB3C", &offset, &current_power_returned_kw_);
t->addMoreExplanation(offset, " current power returned (%f kw)", current_power_returned_kw_);
if (findKey(ValueInformation::DateTime, 0, &key, &values)) {
if (findKey(MeasurementType::Unknown, ValueInformation::DateTime, 0, &key, &values)) {
struct tm datetime;
extractDVdate(&values, key, &offset, &datetime);
device_date_time_ = strdatetime(&datetime);

4
src/meter_apator162.cc
Wyświetl plik

@ -118,10 +118,10 @@ void MeterApator162::processContent(Telegram *t)
strprintf(total, "%02x%02x%02x%02x", t->content[o], t->content[o+1], t->content[o+2], t->content[o+3]);
debug("(apator162) Guessing offset to be %d from byte 0x%02x: total %s\n", o, t->content[13], total.c_str());
vendor_values["0413"] = { 25, DVEntry(0x13, 0, 0, 0, total) };
vendor_values["0413"] = { 25, DVEntry(MeasurementType::Instantaneous, 0x13, 0, 0, 0, total) };
int offset;
string key;
if(findKey(ValueInformation::Volume, 0, &key, &vendor_values)) {
if(findKey(MeasurementType::Unknown, ValueInformation::Volume, 0, &key, &vendor_values)) {
extractDVdouble(&vendor_values, key, &offset, &total_water_consumption_m3_);
//Adding explanation have to wait since it assumes that the dvparser could do something, but it could not here.
//t->addMoreExplanation(offset, " total consumption (%f m3)", total_water_consumption_m3_);

6
src/meter_eurisii.cc
Wyświetl plik

@ -217,13 +217,13 @@ void MeterEurisII::processContent(Telegram *t)
int offset;
string key;
if (findKey(ValueInformation::HeatCostAllocation, 0, &key, &values))
if (findKey(MeasurementType::Unknown, ValueInformation::HeatCostAllocation, 0, &key, &values))
{
extractDVdouble(&values, key, &offset, &current_consumption_hca_);
t->addMoreExplanation(offset, " current consumption (%f hca)", current_consumption_hca_);
}
if (findKey(ValueInformation::Date, 1, &key, &values)) {
if (findKey(MeasurementType::Unknown, ValueInformation::Date, 1, &key, &values)) {
struct tm date;
extractDVdate(&values, key, &offset, &date);
set_date_ = strdate(&date);
@ -232,7 +232,7 @@ void MeterEurisII::processContent(Telegram *t)
for (int i=1; i<=17; ++i)
{
if (findKey(ValueInformation::HeatCostAllocation, i, &key, &values))
if (findKey(MeasurementType::Unknown, ValueInformation::HeatCostAllocation, i, &key, &values))
{
string info;
strprintf(info, " consumption at set date %d (%%f hca)", i);

4
src/meter_iperl.cc
Wyświetl plik

@ -78,12 +78,12 @@ void MeterIperl::processContent(Telegram *t)
int offset;
string key;
if(findKey(ValueInformation::Volume, 0, &key, &values)) {
if(findKey(MeasurementType::Unknown, ValueInformation::Volume, 0, &key, &values)) {
extractDVdouble(&values, key, &offset, &total_water_consumption_m3_);
t->addMoreExplanation(offset, " total consumption (%f m3)", total_water_consumption_m3_);
}
if(findKey(ValueInformation::VolumeFlow, ANY_STORAGENR, &key, &values)) {
if(findKey(MeasurementType::Unknown, ValueInformation::VolumeFlow, ANY_STORAGENR, &key, &values)) {
extractDVdouble(&values, key, &offset, &max_flow_m3h_);
t->addMoreExplanation(offset, " max flow (%f m3/h)", max_flow_m3h_);
}

4
src/meter_lansenth.cc
Wyświetl plik

@ -131,7 +131,7 @@ void MeterLansenTH::processContent(Telegram *t)
int offset;
string key;
if (findKey(ValueInformation::ExternalTemperature, 0, &key, &values))
if (findKey(MeasurementType::Unknown, ValueInformation::ExternalTemperature, 0, &key, &values))
{
extractDVdouble(&values, key, &offset, &current_temperature_c_);
t->addMoreExplanation(offset, " current temperature (%f C)", current_temperature_c_);
@ -139,7 +139,7 @@ void MeterLansenTH::processContent(Telegram *t)
for (int i=1; i<=2; ++i)
{
if (findKey(ValueInformation::ExternalTemperature, i, &key, &values))
if (findKey(MeasurementType::Unknown, ValueInformation::ExternalTemperature, i, &key, &values))
{
string info;
strprintf(info, " temperature at set date %d (%%f c)", i);

4
src/meter_mkradio3.cc
Wyświetl plik

@ -86,7 +86,7 @@ void MKRadio3::processContent(Telegram *t)
string prevs;
strprintf(prevs, "%02x%02x", prev_lo, prev_hi);
int offset = t->parsed.size()+3;
vendor_values["0215"] = { offset, DVEntry(0x15, 0, 0, 0, prevs) };
vendor_values["0215"] = { offset, DVEntry(MeasurementType::Instantaneous, 0x15, 0, 0, 0, prevs) };
t->explanations.push_back({ offset, prevs });
t->addMoreExplanation(offset, " prev consumption (%f m3)", prev);
@ -97,7 +97,7 @@ void MKRadio3::processContent(Telegram *t)
string currs;
strprintf(currs, "%02x%02x", curr_lo, curr_hi);
offset = t->parsed.size()+7;
vendor_values["0215"] = { offset, DVEntry(0x15, 0, 0, 0, currs) };
vendor_values["0215"] = { offset, DVEntry(MeasurementType::Instantaneous, 0x15, 0, 0, 0, currs) };
t->explanations.push_back({ offset, currs });
t->addMoreExplanation(offset, " curr consumption (%f m3)", curr);

10
src/meter_multical21.cc
Wyświetl plik

@ -378,30 +378,30 @@ void MeterMultical21::processContent(Telegram *t)
extractDVuint16(&values, "02FF20", &offset, &info_codes_);
t->addMoreExplanation(offset, " info codes (%s)", statusHumanReadable().c_str());
if(findKey(ValueInformation::Volume, 0, &key, &values)) {
if(findKey(MeasurementType::Instantaneous, ValueInformation::Volume, 0, &key, &values)) {
extractDVdouble(&values, key, &offset, &total_water_consumption_m3_);
has_total_water_consumption_ = true;
t->addMoreExplanation(offset, " total consumption (%f m3)", total_water_consumption_m3_);
}
if(findKey(ValueInformation::Volume, 1, &key, &values)) {
if(findKey(MeasurementType::Unknown, ValueInformation::Volume, 1, &key, &values)) {
extractDVdouble(&values, key, &offset, &target_water_consumption_m3_);
has_target_water_consumption_ = true;
t->addMoreExplanation(offset, " target consumption (%f m3)", target_water_consumption_m3_);
}
if(findKey(ValueInformation::VolumeFlow, ANY_STORAGENR, &key, &values)) {
if(findKey(MeasurementType::Unknown, ValueInformation::VolumeFlow, ANY_STORAGENR, &key, &values)) {
extractDVdouble(&values, key, &offset, &max_flow_m3h_);
has_max_flow_ = true;
t->addMoreExplanation(offset, " max flow (%f m3/h)", max_flow_m3h_);
}
if(findKey(ValueInformation::FlowTemperature, ANY_STORAGENR, &key, &values)) {
if(findKey(MeasurementType::Unknown, ValueInformation::FlowTemperature, ANY_STORAGENR, &key, &values)) {
has_flow_temperature_ = extractDVdouble(&values, key, &offset, &flow_temperature_c_);
t->addMoreExplanation(offset, " flow temperature (%f °C)", flow_temperature_c_);
}
if(findKey(ValueInformation::ExternalTemperature, ANY_STORAGENR, &key, &values)) {
if(findKey(MeasurementType::Unknown, ValueInformation::ExternalTemperature, ANY_STORAGENR, &key, &values)) {
has_external_temperature_ = extractDVdouble(&values, key, &offset, &external_temperature_c_);
t->addMoreExplanation(offset, " external temperature (%f °C)", external_temperature_c_);
}

12
src/meter_qcaloric.cc
Wyświetl plik

@ -174,29 +174,29 @@ void MeterQCaloric::processContent(Telegram *t)
int offset;
string key;
if (findKey(ValueInformation::HeatCostAllocation, 0, &key, &values)) {
if (findKey(MeasurementType::Unknown, ValueInformation::HeatCostAllocation, 0, &key, &values)) {
extractDVdouble(&values, key, &offset, &current_consumption_hca_);
t->addMoreExplanation(offset, " current consumption (%f hca)", current_consumption_hca_);
}
if (findKey(ValueInformation::Date, 1, &key, &values)) {
if (findKey(MeasurementType::Unknown, ValueInformation::Date, 1, &key, &values)) {
struct tm date;
extractDVdate(&values, key, &offset, &date);
set_date_ = strdate(&date);
t->addMoreExplanation(offset, " set date (%s)", set_date_.c_str());
}
if (findKey(ValueInformation::HeatCostAllocation, 1, &key, &values)) {
if (findKey(MeasurementType::Unknown, ValueInformation::HeatCostAllocation, 1, &key, &values)) {
extractDVdouble(&values, key, &offset, &consumption_at_set_date_hca_);
t->addMoreExplanation(offset, " consumption at set date (%f hca)", consumption_at_set_date_hca_);
}
if (findKey(ValueInformation::HeatCostAllocation, 17, &key, &values)) {
if (findKey(MeasurementType::Unknown, ValueInformation::HeatCostAllocation, 17, &key, &values)) {
extractDVdouble(&values, key, &offset, &consumption_at_set_date_17_hca_);
t->addMoreExplanation(offset, " consumption at set date 17 (%f hca)", consumption_at_set_date_17_hca_);
}
if (findKey(ValueInformation::Date, 17, &key, &values)) {
if (findKey(MeasurementType::Unknown, ValueInformation::Date, 17, &key, &values)) {
struct tm date;
extractDVdate(&values, key, &offset, &date);
set_date_17_ = strdate(&date);
@ -211,7 +211,7 @@ void MeterQCaloric::processContent(Telegram *t)
t->addMoreExplanation(offset, " error date (%s)", error_date_.c_str());
}
if (findKey(ValueInformation::DateTime, 0, &key, &values)) {
if (findKey(MeasurementType::Unknown, ValueInformation::DateTime, 0, &key, &values)) {
struct tm datetime;
extractDVdate(&values, key, &offset, &datetime);
device_date_time_ = strdatetime(&datetime);

379
src/meter_rfmamb.cc 100644
Wyświetl plik

@ -0,0 +1,379 @@
/*
Copyright (C) 2019 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"
struct MeterRfmAmb : public virtual TempHygroMeter, public virtual MeterCommonImplementation {
MeterRfmAmb(WMBus *bus, MeterInfo &mi);
double currentTemperature(Unit u);
double maximumTemperature(Unit u);
double minimumTemperature(Unit u);
double maximumTemperatureAtSetDate1(Unit u);
double minimumTemperatureAtSetDate1(Unit u);
double currentRelativeHumidity();
double maximumRelativeHumidity();
double minimumRelativeHumidity();
double maximumRelativeHumidityAtSetDate1();
double minimumRelativeHumidityAtSetDate1();
private:
void processContent(Telegram *t);
double current_temperature_c_ {};
double temperature_at_set_date_c_[2]; // storage nr 1 and 2 stored at index 0 and 1.
double minimum_temperature_c_ {};
double maximum_temperature_c_ {};
double minimum_temperature_at_set_date_1_c_ {};
double maximum_temperature_at_set_date_1_c_ {};
double current_relative_humidity_rh_ {};
double relative_humidity_at_set_date_rh_[2]; // storage nr 1 and 2 stored at index 0 and 1.
double minimum_relative_humidity_rh_ {};
double maximum_relative_humidity_rh_ {};
double minimum_relative_humidity_at_set_date_1_rh_ {};
double maximum_relative_humidity_at_set_date_1_rh_ {};
string device_date_time_;
};
MeterRfmAmb::MeterRfmAmb(WMBus *bus, MeterInfo &mi) :
MeterCommonImplementation(bus, mi, MeterType::RFMAMB, MANUFACTURER_BMT)
{
setEncryptionMode(EncryptionMode::AES_CBC);
addMedia(0x1b);
addLinkMode(LinkMode::T1);
setExpectedVersion(0x10);
addPrint("current_temperature", Quantity::Temperature,
[&](Unit u){ return currentTemperature(u); },
"The current temperature.",
true, true);
addPrint("maximum_temperature", Quantity::Temperature,
[&](Unit u){ return maximumTemperature(u); },
"The maximum temperature.",
true, true);
addPrint("minimum_temperature", Quantity::Temperature,
[&](Unit u){ return minimumTemperature(u); },
"The minimum temperature.",
false, true);
addPrint("maximum_temperature_at_set_date_1", Quantity::Temperature,
[&](Unit u){ return maximumTemperatureAtSetDate1(u); },
"The maximum temperature at set date 1.",
false, true);
addPrint("minimum_temperature_at_set_date_1", Quantity::Temperature,
[&](Unit u){ return minimumTemperatureAtSetDate1(u); },
"The minimum temperature at set date 1.",
false, true);
addPrint("current_relative_humidity", Quantity::RelativeHumidity,
[&](Unit u){ return currentRelativeHumidity(); },
"The current relative humidity.",
true, true);
addPrint("minimum_relative_humidity", Quantity::RelativeHumidity,
[&](Unit u){ return minimumRelativeHumidity(); },
"The minimum relative humidity.",
false, true);
addPrint("maximum_relative_humidity", Quantity::RelativeHumidity,
[&](Unit u){ return maximumRelativeHumidity(); },
"The maximum relative humidity.",
false, true);
addPrint("maximum_relative_humidity_at_set_date_1", Quantity::RelativeHumidity,
[&](Unit u){ return maximumRelativeHumidityAtSetDate1(); },
"The maximum relative humidity at set date 1.",
false, true);
addPrint("minimum_relative_humidity_at_set_date_1", Quantity::RelativeHumidity,
[&](Unit u){ return minimumRelativeHumidityAtSetDate1(); },
"The minimum relative humidity at set date 1.",
false, true);
for (int i=1; i<=2; ++i)
{
string msg, info;
strprintf(msg, "temperature_at_set_date_%d", i);
strprintf(info, "Temperature at the %d billing period date change.", i);
addPrint(msg, Quantity::Temperature,
[this,i](Unit u){ return temperature_at_set_date_c_[i-1]; },
info,
false, true);
strprintf(msg, "relative_humidity_at_set_date_%d", i);
strprintf(info, "Relative humidity at the %d billing period date change.", i);
addPrint(msg, Quantity::RelativeHumidity,
[this,i](Unit u){ return relative_humidity_at_set_date_rh_[i-1]; },
info,
false, true);
}
addPrint("device_date_time", Quantity::Text,
[&](){ return device_date_time_; },
"Device date time.",
false, true);
MeterCommonImplementation::bus()->onTelegram(calll(this,handleTelegram,Telegram*));
}
unique_ptr<TempHygroMeter> createRfmAmb(WMBus *bus, MeterInfo &mi)
{
return unique_ptr<TempHygroMeter>(new MeterRfmAmb(bus, mi));
}
double MeterRfmAmb::currentTemperature(Unit u)
{
assertQuantity(u, Quantity::Temperature);
return convert(current_temperature_c_, Unit::C, u);
}
double MeterRfmAmb::maximumTemperature(Unit u)
{
assertQuantity(u, Quantity::Temperature);
return convert(maximum_temperature_c_, Unit::C, u);
}
double MeterRfmAmb::minimumTemperature(Unit u)
{
assertQuantity(u, Quantity::Temperature);
return convert(minimum_temperature_c_, Unit::C, u);
}
double MeterRfmAmb::maximumTemperatureAtSetDate1(Unit u)
{
assertQuantity(u, Quantity::Temperature);
return convert(maximum_temperature_at_set_date_1_c_, Unit::C, u);
}
double MeterRfmAmb::minimumTemperatureAtSetDate1(Unit u)
{
assertQuantity(u, Quantity::Temperature);
return convert(minimum_temperature_at_set_date_1_c_, Unit::C, u);
}
double MeterRfmAmb::currentRelativeHumidity()
{
return current_relative_humidity_rh_;
}
double MeterRfmAmb::maximumRelativeHumidity()
{
return maximum_relative_humidity_rh_;
}
double MeterRfmAmb::minimumRelativeHumidity()
{
return minimum_relative_humidity_rh_;
}
double MeterRfmAmb::maximumRelativeHumidityAtSetDate1()
{
return maximum_relative_humidity_at_set_date_1_rh_;
}
double MeterRfmAmb::minimumRelativeHumidityAtSetDate1()
{
return minimum_relative_humidity_at_set_date_1_rh_;
}
void MeterRfmAmb::processContent(Telegram *t)
{
/*
(rfmamb) 0f: 02 dif (16 Bit Integer/Binary Instantaneous value)
(rfmamb) 10: 65 vif (External temperature 10⁻² °C)
(rfmamb) 11: * A008 current temperature (22.080000 C)
(rfmamb) 13: 42 dif (16 Bit Integer/Binary Instantaneous value storagenr=1)
(rfmamb) 14: 65 vif (External temperature 10⁻² °C)
(rfmamb) 15: * 8F08 temperature at set date 1 (21.910000 c)
(rfmamb) 17: 82 dif (16 Bit Integer/Binary Instantaneous value)
(rfmamb) 18: 01 dife (subunit=0 tariff=0 storagenr=2)
(rfmamb) 19: 65 vif (External temperature 10⁻² °C)
(rfmamb) 1a: * 9F08 temperature at set date 2 (22.070000 c)
(rfmamb) 1c: 22 dif (16 Bit Integer/Binary Minimum value)
(rfmamb) 1d: 65 vif (External temperature 10⁻² °C)
(rfmamb) 1e: * 8908 minimum temperature (21.850000 C)
(rfmamb) 20: 12 dif (16 Bit Integer/Binary Maximum value)
(rfmamb) 21: 65 vif (External temperature 10⁻² °C)
(rfmamb) 22: * A008 maximum temperature (22.080000 C)
(rfmamb) 24: 62 dif (16 Bit Integer/Binary Minimum value storagenr=1)
(rfmamb) 25: 65 vif (External temperature 10⁻² °C)
(rfmamb) 26: * 5108 minimum temperature at set date 1 (21.290000 C)
(rfmamb) 28: 52 dif (16 Bit Integer/Binary Maximum value storagenr=1)
(rfmamb) 29: 65 vif (External temperature 10⁻² °C)
(rfmamb) 2a: * 2B09 maximum temperature at set date 1 (23.470000 C)
(rfmamb) 2c: 02 dif (16 Bit Integer/Binary Instantaneous value)
(rfmamb) 2d: FB vif (First extension of VIF-codes)
(rfmamb) 2e: 1A vife (?)
(rfmamb) 2f: * BA01 current relative humidity (44.200000 RH)
(rfmamb) 31: 42 dif (16 Bit Integer/Binary Instantaneous value storagenr=1)
(rfmamb) 32: FB vif (First extension of VIF-codes)
(rfmamb) 33: 1A vife (?)
(rfmamb) 34: * B001 relative humidity at set date 1 (43.200000 RH)
(rfmamb) 36: 82 dif (16 Bit Integer/Binary Instantaneous value)
(rfmamb) 37: 01 dife (subunit=0 tariff=0 storagenr=2)
(rfmamb) 38: FB vif (First extension of VIF-codes)
(rfmamb) 39: 1A vife (?)
(rfmamb) 3a: * BD01 relative humidity at set date 2 (44.500000 RH)
(rfmamb) 3c: 22 dif (16 Bit Integer/Binary Minimum value)
(rfmamb) 3d: FB vif (First extension of VIF-codes)
(rfmamb) 3e: 1A vife (?)
(rfmamb) 3f: * A901 minimum relative humidity (42.500000 RH)
(rfmamb) 41: 12 dif (16 Bit Integer/Binary Maximum value)
(rfmamb) 42: FB vif (First extension of VIF-codes)
(rfmamb) 43: 1A vife (?)
(rfmamb) 44: * BA01 maximum relative humidity (44.200000 RH)
(rfmamb) 46: 62 dif (16 Bit Integer/Binary Minimum value storagenr=1)
(rfmamb) 47: FB vif (First extension of VIF-codes)
(rfmamb) 48: 1A vife (?)
(rfmamb) 49: * A601 minimum relative humidity at set date 1 (42.200000 RH)
(rfmamb) 4b: 52 dif (16 Bit Integer/Binary Maximum value storagenr=1)
(rfmamb) 4c: FB vif (First extension of VIF-codes)
(rfmamb) 4d: 1A vife (?)
(rfmamb) 4e: * F501 maximum relative humidity at set date 1 (50.100000 RH)
(rfmamb) 50: 06 dif (48 Bit Integer/Binary Instantaneous value)
(rfmamb) 51: 6D vif (Date and time type)
(rfmamb) 52: * 3B3BB36B2A00 device datetime (2019-10-11 19:59)
*/
map<string,pair<int,DVEntry>> values;
parseDV(t, t->content, t->content.begin(), t->content.size(), &values);
int offset;
string key;
if (findKey(MeasurementType::Instantaneous, ValueInformation::ExternalTemperature, 0, &key, &values))
{
extractDVdouble(&values, key, &offset, &current_temperature_c_);
t->addMoreExplanation(offset, " current temperature (%f C)", current_temperature_c_);
}
if (findKey(MeasurementType::Maximum, ValueInformation::ExternalTemperature, 0, &key, &values))
{
extractDVdouble(&values, key, &offset, &maximum_temperature_c_);
t->addMoreExplanation(offset, " maximum temperature (%f C)", maximum_temperature_c_);
}
if (findKey(MeasurementType::Minimum, ValueInformation::ExternalTemperature, 0, &key, &values))
{
extractDVdouble(&values, key, &offset, &minimum_temperature_c_);
t->addMoreExplanation(offset, " minimum temperature (%f C)", minimum_temperature_c_);
}
if (findKey(MeasurementType::Maximum, ValueInformation::ExternalTemperature, 1, &key, &values))
{
extractDVdouble(&values, key, &offset, &maximum_temperature_at_set_date_1_c_);
t->addMoreExplanation(offset, " maximum temperature at set date 1 (%f C)",
maximum_temperature_at_set_date_1_c_);
}
if (findKey(MeasurementType::Minimum, ValueInformation::ExternalTemperature, 1, &key, &values))
{
extractDVdouble(&values, key, &offset, &minimum_temperature_at_set_date_1_c_);
t->addMoreExplanation(offset, " minimum temperature at set date 1 (%f C)",
minimum_temperature_at_set_date_1_c_);
}
for (int i=1; i<=2; ++i)
{
if (findKey(MeasurementType::Unknown, ValueInformation::ExternalTemperature, i, &key, &values))
{
string info;
strprintf(info, " temperature at set date %d (%%f c)", i);
extractDVdouble(&values, key, &offset, &temperature_at_set_date_c_[i-1]);
t->addMoreExplanation(offset, info.c_str(), temperature_at_set_date_c_[i-1]);
}
}
// Temporarily silly solution until the dvparser is upgraded with support for extension
key = "02FB1A"; // 1A = 0001 1010 = First extension vif code Relative Humidity 10^-1
if (hasKey(&values, key))
{
double tmp;
extractDVdouble(&values, key, &offset, &tmp, false);
current_relative_humidity_rh_ = tmp / (double)10.0;
t->addMoreExplanation(offset, " current relative humidity (%f RH)", current_relative_humidity_rh_);
}
key = "22FB1A"; // 1A = 0001 1010 = First extension vif code Relative Humidity 10^-1
if (hasKey(&values, key))
{
double tmp;
extractDVdouble(&values, key, &offset, &tmp, false);
minimum_relative_humidity_rh_ = tmp / (double)10.0;
t->addMoreExplanation(offset, " minimum relative humidity (%f RH)", minimum_relative_humidity_rh_);
}
key = "12FB1A"; // 1A = 0001 1010 = First extension vif code Relative Humidity 10^-1
if (hasKey(&values, key))
{
double tmp;
extractDVdouble(&values, key, &offset, &tmp, false);
maximum_relative_humidity_rh_ = tmp / (double)10.0;
t->addMoreExplanation(offset, " maximum relative humidity (%f RH)", maximum_relative_humidity_rh_);
}
key = "42FB1A"; // 1A = 0001 1010 = First extension vif code Relative Humidity 10^-1
if (hasKey(&values, key))
{
double tmp;
extractDVdouble(&values, key, &offset, &tmp, false);
relative_humidity_at_set_date_rh_[0] = tmp / (double)10.0;
t->addMoreExplanation(offset, " relative humidity at set date 1 (%f RH)", relative_humidity_at_set_date_rh_[0]);
}
key = "62FB1A"; // 1A = 0001 1010 = First extension vif code Relative Humidity 10^-1
if (hasKey(&values, key))
{
double tmp;
extractDVdouble(&values, key, &offset, &tmp, false);
minimum_relative_humidity_at_set_date_1_rh_ = tmp / (double)10.0;
t->addMoreExplanation(offset, " minimum relative humidity at set date 1 (%f RH)", minimum_relative_humidity_at_set_date_1_rh_);
}
key = "52FB1A"; // 1A = 0001 1010 = First extension vif code Relative Humidity 10^-1
if (hasKey(&values, key))
{
double tmp;
extractDVdouble(&values, key, &offset, &tmp, false);
maximum_relative_humidity_at_set_date_1_rh_ = tmp / (double)10.0;
t->addMoreExplanation(offset, " maximum relative humidity at set date 1 (%f RH)", maximum_relative_humidity_at_set_date_1_rh_);
}
key = "8201FB1A"; // 1A = 0001 1010 = First extension vif code Relative Humidity 10^-1
if (hasKey(&values, key))
{
double tmp;
extractDVdouble(&values, key, &offset, &tmp, false);
relative_humidity_at_set_date_rh_[1] = tmp / (double)10.0;
t->addMoreExplanation(offset, " relative humidity at set date 2 (%f RH)", relative_humidity_at_set_date_rh_[1]);
}
if (findKey(MeasurementType::Unknown, ValueInformation::DateTime, 0, &key, &values)) {
struct tm datetime;
extractDVdate(&values, key, &offset, &datetime);
device_date_time_ = strdatetime(&datetime);
t->addMoreExplanation(offset, " device datetime (%s)", device_date_time_.c_str());
}
}

2
src/meter_supercom587.cc
Wyświetl plik

@ -70,7 +70,7 @@ void MeterSupercom587::processContent(Telegram *t)
int offset;
string key;
if(findKey(ValueInformation::Volume, 0, &key, &values)) {
if(findKey(MeasurementType::Unknown, ValueInformation::Volume, 0, &key, &values)) {
extractDVdouble(&values, key, &offset, &total_water_consumption_m3_);
t->addMoreExplanation(offset, " total consumption (%f m3)", total_water_consumption_m3_);
}

4
src/meter_vario451.cc
Wyświetl plik

@ -107,7 +107,7 @@ void MeterVario451::processContent(Telegram *t)
string prevs;
strprintf(prevs, "%02x%02x", prev_lo, prev_hi);
int offset = t->parsed.size()+3;
vendor_values["0215"] = { offset, DVEntry(0x15, 0, 0, 0, prevs) };
vendor_values["0215"] = { offset, DVEntry(MeasurementType::Instantaneous, 0x15, 0, 0, 0, prevs) };
t->explanations.push_back({ offset, prevs });
t->addMoreExplanation(offset, " energy used in previous billing period (%f GJ)", prev);
@ -118,7 +118,7 @@ void MeterVario451::processContent(Telegram *t)
string currs;
strprintf(currs, "%02x%02x", curr_lo, curr_hi);
offset = t->parsed.size()+7;
vendor_values["0215"] = { offset, DVEntry(0x15, 0, 0, 0, currs) };
vendor_values["0215"] = { offset, DVEntry(MeasurementType::Instantaneous, 0x15, 0, 0, 0, currs) };
t->explanations.push_back({ offset, currs });
t->addMoreExplanation(offset, " energy used in current billing period (%f GJ)", curr);

2
src/meters.h
Wyświetl plik

@ -36,6 +36,7 @@
X(multical21, C1_bit, Water, MULTICAL21, Multical21) \
X(multical302,C1_bit, Heat, MULTICAL302, Multical302) \
X(omnipower, C1_bit, Electricity, OMNIPOWER, Omnipower) \
X(rfmamb, T1_bit, TempHygro, RFMAMB, RfmAmb) \
X(qcaloric, C1_bit, HeatCostAllocation, QCALORIC, QCaloric) \
X(supercom587,T1_bit, Water, SUPERCOM587, Supercom587) \
X(vario451, T1_bit, Heat, VARIO451, Vario451) \
@ -186,6 +187,7 @@ unique_ptr<WaterMeter> createIperl(WMBus *bus, MeterInfo &m);
unique_ptr<HeatCostMeter> createQCaloric(WMBus *bus, MeterInfo &m);
unique_ptr<HeatCostMeter> createEurisII(WMBus *bus, MeterInfo &m);
unique_ptr<TempHygroMeter> createLansenTH(WMBus *bus, MeterInfo &m);
unique_ptr<TempHygroMeter> createRfmAmb(WMBus *bus, MeterInfo &m);
GenericMeter *createGeneric(WMBus *bus, MeterInfo &m);
#endif

24
src/wmbus.cc
Wyświetl plik

@ -811,6 +811,18 @@ string difType(int dif)
return s;
}
MeasurementType difMeasurementType(int dif)
{
int t = dif & 0x30;
switch (t) {
case 0x00: return MeasurementType::Instantaneous;
case 0x10: return MeasurementType::Maximum;
case 0x20: return MeasurementType::Minimum;
case 0x30: return MeasurementType::AtError;
}
assert(0);
}
string vifType(int vif)
{
int extension = vif & 0x80;
@ -2233,5 +2245,17 @@ string linkModeName(LinkMode link_mode)
return "UnknownLinkMode";
}
string measurementTypeName(MeasurementType mt)
{
switch (mt) {
case MeasurementType::Instantaneous: return "instantaneous";
case MeasurementType::Maximum: return "maximum";
case MeasurementType::Minimum: return "minimum";
case MeasurementType::AtError: return "aterror";
case MeasurementType::Unknown: return "unknown";
}
assert(0);
}
WMBus::~WMBus() {
}

11
src/wmbus.h
Wyświetl plik

@ -116,6 +116,15 @@ enum class EncryptionMode
AES_CTR
};
enum class MeasurementType
{
Unknown,
Instantaneous,
Minimum,
Maximum,
AtError
};
using namespace std;
struct Telegram {
@ -234,7 +243,9 @@ double extract16bitAsDouble(int dif, int vif, int vife, string data);
double extract32bitAsDouble(int dif, int vif, int vife, string data);
int difLenBytes(int dif);
MeasurementType difMeasurementType(int dif);
string linkModeName(LinkMode link_mode);
string measurementTypeName(MeasurementType mt);
#endif

3
tests/test_listen_to_all.sh
Wyświetl plik

@ -54,6 +54,9 @@ Received telegram from: 88018801
Received telegram from: 00010203
manufacturer: (LAS) Lansen Systems, Sweden
device type: Room sensor (eg temperature or humidity)
Received telegram from: 11772288
manufacturer: (BMT) BMETERS, Italy
device type: Room sensor (eg temperature or humidity)
EOF
EXPECTED=$(cat $LOGFILE_EXPECTED)

1
tests/test_t1_meters.sh
Wyświetl plik

@ -20,6 +20,7 @@ $PROG --format=json simulations/simulation_t1.txt \
HeatMeter vario451 58234965 "" \
HeatMeter eurisii 88018801 "" \
Tempoo lansenth 00010203 "" \
Rummet rfmamb 11772288 "" \
> $TEST/test_output.txt
if [ "$?" == "0" ]
then