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

Refactored driver rfmamb to new format.

pull/708/head
Fredrik Öhrström 2022-11-27 01:04:20 +01:00
rodzic d925a6869c
commit e95cca5eea
8 zmienionych plików z 237 dodań i 389 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
CHANGES
Wyświetl plik

@ -9,6 +9,10 @@ using the calculation feature.
E.g. --calculate_total_gj=total_kwh
ATTENTION! The rfmamb driver has been refactored to the new driver format.
A bug was found and fixed where min and max relative humidity over 1h and 24h were wrong.
The field device_date_time has been renamed to device_datetime.
ATTENTION! The hydrocalm3 driver has been refactored to the new driver format.
The field device_date_time has been renamed to device_datetime.

4
simulations/simulation_t1.txt
Wyświetl plik

@ -117,8 +117,8 @@ telegram=|234433300602010014007a8e0000002f2f0efd3a1147000000008e40fd3a3412000000
# Test BMEters RFM-AMB Temperature Hygrometer telegram
telegram=|5744b40988227711101b7ab20800000265a00842658f088201659f08226589081265a0086265510852652b0902fb1aba0142fb1ab0018201fb1abd0122fb1aa90112fb1aba0162fb1aa60152fb1af501066d3b3bb36b2a00|
{"media":"room sensor","meter":"rfmamb","name":"Rummet","id":"11772288","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"minimum_temperature_1h_c":21.85,"maximum_temperature_24h_c":23.47,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"minimum_relative_humidity_1h_rh":42.2,"maximum_relative_humidity_1h_rh":50.1,"maximum_relative_humidity_24h_rh":0,"minimum_relative_humidity_24h_rh":0,"device_date_time":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z"}
|Rummet;11772288;22.080000;44.200000;1111-11-11 11:11.11
{"media":"room sensor","meter":"rfmamb","name":"Rummet","id":"11772288","status":"PERMANENT_ERROR","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"minimum_temperature_1h_c":21.85,"maximum_temperature_24h_c":23.47,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"minimum_relative_humidity_1h_rh":42.5,"maximum_relative_humidity_1h_rh":44.2,"maximum_relative_humidity_24h_rh":50.1,"minimum_relative_humidity_24h_rh":42.2,"device_datetime":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z"}
|Rummet;11772288;22.08;44.2;1111-11-11 11:11.11
# Test Hydrus water meter telegram
telegram=|4E44A5116464646470077AED004005_2F2F01FD08300C13741100007C1300000000FC101300000000FC201300000000726C00000B3B00000002FD748713025A6800C4016D3B177F2ACC011300020000|

223
src/driver_rfmamb.cc 100644
Wyświetl plik

@ -0,0 +1,223 @@
/*
Copyright (C) 2019-2022 Fredrik Öhrström (gpl-3.0-or-later)
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"meters_common_implementation.h"
namespace
{
struct Driver : public virtual MeterCommonImplementation
{
Driver(MeterInfo &mi, DriverInfo &di);
};
static bool ok = registerDriver([](DriverInfo&di)
{
di.setName("rfmamb");
di.setDefaultFields("name,id,current_temperature_c,current_relative_humidity_rh,timestamp");
di.setMeterType(MeterType::TempHygroMeter);
di.addLinkMode(LinkMode::T1);
di.setConstructor([](MeterInfo& mi, DriverInfo& di){ return shared_ptr<Meter>(new Driver(mi, di)); });
di.addDetection(MANUFACTURER_BMT, 0x1b, 0x10);
});
Driver::Driver(MeterInfo &mi, DriverInfo &di) : MeterCommonImplementation(mi, di)
{
addStringField(
"status",
"Meter status from tpl status field.",
PrintProperty::JSON | PrintProperty::IMPORTANT |
PrintProperty::STATUS | PrintProperty::JOIN_TPL_STATUS);
addNumericFieldWithExtractor(
"current_temperature",
"The current temperature.",
PrintProperty::JSON,
Quantity::Temperature,
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::ExternalTemperature)
);
addNumericFieldWithExtractor(
"average_temperature_1h",
"The average temperature over the last hour.",
PrintProperty::JSON,
Quantity::Temperature,
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::ExternalTemperature)
.set(StorageNr(1))
);
addNumericFieldWithExtractor(
"average_temperature_24h",
"The average temperature over the last 24 hours.",
PrintProperty::JSON,
Quantity::Temperature,
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::ExternalTemperature)
.set(StorageNr(2))
);
addNumericFieldWithExtractor(
"maximum_temperature_1h",
"The maximum temperature over the last hour.",
PrintProperty::JSON,
Quantity::Temperature,
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Maximum)
.set(VIFRange::ExternalTemperature)
);
addNumericFieldWithExtractor(
"maximum_temperature_24h",
"The maximum temperature over the last 24 hours.",
PrintProperty::JSON,
Quantity::Temperature,
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Maximum)
.set(VIFRange::ExternalTemperature)
.set(StorageNr(1))
);
addNumericFieldWithExtractor(
"minimum_temperature_1h",
"The minimum temperature over the last hour.",
PrintProperty::JSON,
Quantity::Temperature,
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Minimum)
.set(VIFRange::ExternalTemperature)
);
addNumericFieldWithExtractor(
"minimum_temperature_24h",
"The minimum temperature over the last 24 hours.",
PrintProperty::JSON,
Quantity::Temperature,
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Minimum)
.set(VIFRange::ExternalTemperature)
.set(StorageNr(1))
);
addNumericFieldWithExtractor(
"current_relative_humidity",
"The current relative humidity.",
PrintProperty::JSON,
Quantity::RelativeHumidity,
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::RelativeHumidity)
);
addNumericFieldWithExtractor(
"average_relative_humidity_1h",
"The average relative humidity over the last hour.",
PrintProperty::JSON,
Quantity::RelativeHumidity,
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::RelativeHumidity)
.set(StorageNr(1))
);
addNumericFieldWithExtractor(
"average_relative_humidity_24h",
"The average relative humidity over the last 24 hours.",
PrintProperty::JSON,
Quantity::RelativeHumidity,
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::RelativeHumidity)
.set(StorageNr(2))
);
addNumericFieldWithExtractor(
"maximum_relative_humidity_1h",
"The maximum relative humidity over the last hour.",
PrintProperty::JSON,
Quantity::RelativeHumidity,
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Maximum)
.set(VIFRange::RelativeHumidity)
);
addNumericFieldWithExtractor(
"maximum_relative_humidity_24h",
"The maximum relative humidity over the last 24 hours.",
PrintProperty::JSON,
Quantity::RelativeHumidity,
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Maximum)
.set(VIFRange::RelativeHumidity)
.set(StorageNr(1))
);
addNumericFieldWithExtractor(
"minimum_relative_humidity_1h",
"The minimum relative humidity over the last hour.",
PrintProperty::JSON,
Quantity::RelativeHumidity,
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Minimum)
.set(VIFRange::RelativeHumidity)
);
addNumericFieldWithExtractor(
"minimum_relative_humidity_24h",
"The minimum relative humidity over the last 24 hours.",
PrintProperty::JSON,
Quantity::RelativeHumidity,
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Minimum)
.set(VIFRange::RelativeHumidity)
.set(StorageNr(1))
);
addNumericFieldWithExtractor(
"device",
"The meters date time.",
PrintProperty::JSON,
Quantity::PointInTime,
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::DateTime)
);
}
}
// Test: Rummet rfmamb 11772288 NOKEY
// telegram=|5744b40988227711101b7ab20800000265a00842658f088201659f08226589081265a0086265510852652b0902fb1aba0142fb1ab0018201fb1abd0122fb1aa90112fb1aba0162fb1aa60152fb1af501066d3b3bb36b2a00|
// {"media":"room sensor","meter":"rfmamb","name":"Rummet","id":"11772288","status":"PERMANENT_ERROR","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"minimum_temperature_1h_c":21.85,"maximum_temperature_24h_c":23.47,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"minimum_relative_humidity_1h_rh":42.5,"maximum_relative_humidity_1h_rh":44.2,"maximum_relative_humidity_24h_rh":50.1,"minimum_relative_humidity_24h_rh":42.2,"device_datetime":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z"}
// |Rummet;11772288;22.08;44.2;1111-11-11 11:11.11

1
src/meter_detection.h
Wyświetl plik

@ -37,7 +37,6 @@
X(MULTICAL403,MANUFACTURER_KAM, 0x0d, 0x34) \
X(MULTICAL602,MANUFACTURER_KAM, 0x04, 0x1c) \
X(MULTICAL803,MANUFACTURER_KAM, 0x04, 0x39) \
X(RFMAMB, MANUFACTURER_BMT, 0x1b, 0x10) \
X(RFMTX1, MANUFACTURER_BMT, 0x07, 0x05) \

377
src/meter_rfmamb.cc
Wyświetl plik

@ -1,377 +0,0 @@
/*
Copyright (C) 2019-2020 Fredrik Öhrström (gpl-3.0-or-later)
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 MeterCommonImplementation {
MeterRfmAmb(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 average_temperature_1h_c_ {};
double average_temperature_24h_c_ {};
double minimum_temperature_1h_c_ {};
double maximum_temperature_1h_c_ {};
double minimum_temperature_24h_c_ {};
double maximum_temperature_24h_c_ {};
double current_relative_humidity_rh_ {};
double average_relative_humidity_1h_rh_ {};
double average_relative_humidity_24h_rh_ {};
double minimum_relative_humidity_1h_rh_ {};
double maximum_relative_humidity_1h_rh_ {};
double minimum_relative_humidity_24h_rh_ {};
double maximum_relative_humidity_24h_rh_ {};
string device_date_time_;
};
MeterRfmAmb::MeterRfmAmb(MeterInfo &mi) :
MeterCommonImplementation(mi, "rfmamb")
{
setMeterType(MeterType::TempHygroMeter);
setExpectedTPLSecurityMode(TPLSecurityMode::AES_CBC_IV);
addLinkMode(LinkMode::T1);
addPrint("current_temperature", Quantity::Temperature,
[&](Unit u){ return currentTemperature(u); },
"The current temperature.",
PrintProperty::FIELD | PrintProperty::JSON);
addPrint("average_temperature_1h", Quantity::Temperature,
[this](Unit u){ return convert(average_temperature_1h_c_, Unit::C, u); },
"The average temperature for the last hour.",
PrintProperty::JSON);
addPrint("average_temperature_24h", Quantity::Temperature,
[this](Unit u){ return convert(average_temperature_24h_c_, Unit::C, u); },
"The average temperature for the last 24 hours",
PrintProperty::JSON);
addPrint("maximum_temperature_1h", Quantity::Temperature,
[&](Unit u){ return maximumTemperature(u); },
"The maximum temperature.",
PrintProperty::JSON);
addPrint("minimum_temperature_1h", Quantity::Temperature,
[&](Unit u){ return minimumTemperature(u); },
"The minimum temperature.",
PrintProperty::JSON);
addPrint("maximum_temperature_24h", Quantity::Temperature,
[&](Unit u){ return maximumTemperatureAtSetDate1(u); },
"The maximum temperature at set date 1.",
PrintProperty::JSON);
addPrint("minimum_temperature_24h", Quantity::Temperature,
[&](Unit u){ return minimumTemperatureAtSetDate1(u); },
"The minimum temperature at set date 1.",
PrintProperty::JSON);
addPrint("current_relative_humidity", Quantity::RelativeHumidity,
[&](Unit u){ return currentRelativeHumidity(); },
"The current relative humidity.",
PrintProperty::FIELD | PrintProperty::JSON);
addPrint("average_relative_humidity_1h", Quantity::RelativeHumidity,
[this](Unit u){ return convert(average_relative_humidity_1h_rh_, Unit::RH, u); },
"The averate relative humidity for the last hours.",
PrintProperty::JSON);
addPrint("average_relative_humidity_24h", Quantity::RelativeHumidity,
[this](Unit u){ return convert(average_relative_humidity_24h_rh_, Unit::RH, u); },
"The average relative humidity for the last 24 hours.",
PrintProperty::JSON);
addPrint("minimum_relative_humidity_1h", Quantity::RelativeHumidity,
[&](Unit u){ return minimumRelativeHumidity(); },
"The minimum relative humidity.",
PrintProperty::JSON);
addPrint("maximum_relative_humidity_1h", Quantity::RelativeHumidity,
[&](Unit u){ return maximumRelativeHumidity(); },
"The maximum relative humidity.",
PrintProperty::JSON);
addPrint("maximum_relative_humidity_24h", Quantity::RelativeHumidity,
[&](Unit u){ return maximumRelativeHumidityAtSetDate1(); },
"The maximum relative humidity at set date 1.",
PrintProperty::JSON);
addPrint("minimum_relative_humidity_24h", Quantity::RelativeHumidity,
[&](Unit u){ return minimumRelativeHumidityAtSetDate1(); },
"The minimum relative humidity at set date 1.",
PrintProperty::JSON);
addPrint("device_date_time", Quantity::Text,
[&](){ return device_date_time_; },
"Device date time.",
PrintProperty::JSON);
}
shared_ptr<Meter> createRfmAmb(MeterInfo &mi)
{
return shared_ptr<Meter>(new MeterRfmAmb(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_1h_c_, Unit::C, u);
}
double MeterRfmAmb::minimumTemperature(Unit u)
{
assertQuantity(u, Quantity::Temperature);
return convert(minimum_temperature_1h_c_, Unit::C, u);
}
double MeterRfmAmb::maximumTemperatureAtSetDate1(Unit u)
{
assertQuantity(u, Quantity::Temperature);
return convert(maximum_temperature_24h_c_, Unit::C, u);
}
double MeterRfmAmb::minimumTemperatureAtSetDate1(Unit u)
{
assertQuantity(u, Quantity::Temperature);
return convert(minimum_temperature_24h_c_, Unit::C, u);
}
double MeterRfmAmb::currentRelativeHumidity()
{
return current_relative_humidity_rh_;
}
double MeterRfmAmb::maximumRelativeHumidity()
{
return maximum_relative_humidity_1h_rh_;
}
double MeterRfmAmb::minimumRelativeHumidity()
{
return minimum_relative_humidity_1h_rh_;
}
double MeterRfmAmb::maximumRelativeHumidityAtSetDate1()
{
return maximum_relative_humidity_24h_rh_;
}
double MeterRfmAmb::minimumRelativeHumidityAtSetDate1()
{
return minimum_relative_humidity_24h_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)
*/
int offset;
string key;
if (findKey(MeasurementType::Instantaneous, VIFRange::ExternalTemperature, 0, 0, &key, &t->dv_entries))
{
extractDVdouble(&t->dv_entries, key, &offset, &current_temperature_c_);
t->addMoreExplanation(offset, " current temperature (%f C)", current_temperature_c_);
}
if (findKey(MeasurementType::Maximum, VIFRange::ExternalTemperature, 0, 0, &key, &t->dv_entries))
{
extractDVdouble(&t->dv_entries, key, &offset, &maximum_temperature_1h_c_);
t->addMoreExplanation(offset, " maximum temperature 1h (%f C)", maximum_temperature_1h_c_);
}
if (findKey(MeasurementType::Minimum, VIFRange::ExternalTemperature, 0, 0, &key, &t->dv_entries))
{
extractDVdouble(&t->dv_entries, key, &offset, &minimum_temperature_1h_c_);
t->addMoreExplanation(offset, " minimum temperature 1h (%f C)", minimum_temperature_1h_c_);
}
if (findKey(MeasurementType::Maximum, VIFRange::ExternalTemperature, 1, 0, &key, &t->dv_entries))
{
extractDVdouble(&t->dv_entries, key, &offset, &maximum_temperature_24h_c_);
t->addMoreExplanation(offset, " maximum temperature 24h (%f C)",
maximum_temperature_24h_c_);
}
if (findKey(MeasurementType::Minimum, VIFRange::ExternalTemperature, 1, 0, &key, &t->dv_entries))
{
extractDVdouble(&t->dv_entries, key, &offset, &minimum_temperature_24h_c_);
t->addMoreExplanation(offset, " minimum temperature 24h (%f C)",
minimum_temperature_24h_c_);
}
if (findKey(MeasurementType::Instantaneous, VIFRange::ExternalTemperature, 1, 0, &key, &t->dv_entries))
{
extractDVdouble(&t->dv_entries, key, &offset, &average_temperature_1h_c_);
t->addMoreExplanation(offset, " average temperature 1h (%f C)", average_temperature_1h_c_);
}
if (findKey(MeasurementType::Instantaneous, VIFRange::ExternalTemperature, 2, 0, &key, &t->dv_entries))
{
extractDVdouble(&t->dv_entries, key, &offset, &average_temperature_24h_c_);
t->addMoreExplanation(offset, " average temperature 24h (%f C)", average_temperature_24h_c_);
}
// Temporarily silly solution until the dvparser is upgraded with support for extension
key = "02FB1A"; // 02=current 16bit, 1A = 0001 1010 = First extension vif code Relative Humidity 10^-1
if (hasKey(&t->dv_entries, key))
{
double tmp;
extractDVdouble(&t->dv_entries, 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"; // 22=minimum 16bit, 1A = 0001 1010 = First extension vif code Relative Humidity 10^-1
if (hasKey(&t->dv_entries, key))
{
double tmp;
extractDVdouble(&t->dv_entries, key, &offset, &tmp, false);
minimum_relative_humidity_1h_rh_ = tmp / (double)10.0;
t->addMoreExplanation(offset, " minimum relative humidity 1h (%f RH)", minimum_relative_humidity_1h_rh_);
}
key = "12FB1A"; // 12=maximum 16bit, 1A = 0001 1010 = First extension vif code Relative Humidity 10^-1
if (hasKey(&t->dv_entries, key))
{
double tmp;
extractDVdouble(&t->dv_entries, key, &offset, &tmp, false);
maximum_relative_humidity_1h_rh_ = tmp / (double)10.0;
t->addMoreExplanation(offset, " maximum relative humidity 1h (%f RH)", maximum_relative_humidity_1h_rh_);
}
key = "42FB1A"; // 42=instant 1storage 16bit, 1A = 0001 1010 = First extension vif code Relative Humidity 10^-1
if (hasKey(&t->dv_entries, key))
{
double tmp;
extractDVdouble(&t->dv_entries, key, &offset, &tmp, false);
average_relative_humidity_1h_rh_ = tmp / (double)10.0;
t->addMoreExplanation(offset, " average relative humidity 1h (%f RH)", average_relative_humidity_1h_rh_);
}
key = "62FB1A"; // 62=minimum 1storage 16bit, 1A = 0001 1010 = First extension vif code Relative Humidity 10^-1
if (hasKey(&t->dv_entries, key))
{
double tmp;
extractDVdouble(&t->dv_entries, key, &offset, &tmp, false);
minimum_relative_humidity_1h_rh_ = tmp / (double)10.0;
t->addMoreExplanation(offset, " minimum relative humidity 1h (%f RH)", minimum_relative_humidity_1h_rh_);
}
key = "52FB1A"; // 52=maximum 1storage 16bit, 1A = 0001 1010 = First extension vif code Relative Humidity 10^-1
if (hasKey(&t->dv_entries, key))
{
double tmp;
extractDVdouble(&t->dv_entries, key, &offset, &tmp, false);
maximum_relative_humidity_1h_rh_ = tmp / (double)10.0;
t->addMoreExplanation(offset, " maximum relative humidity 1h (%f RH)", maximum_relative_humidity_1h_rh_);
}
key = "8201FB1A"; // 8201=instant 2storage 16bit, 1A = 0001 1010 = First extension vif code Relative Humidity 10^-1
if (hasKey(&t->dv_entries, key))
{
double tmp;
extractDVdouble(&t->dv_entries, key, &offset, &tmp, false);
average_relative_humidity_24h_rh_ = tmp / (double)10.0;
t->addMoreExplanation(offset, " relative humidity 24h (%f RH)", average_relative_humidity_24h_rh_);
}
if (findKey(MeasurementType::Instantaneous, VIFRange::DateTime, 0, 0, &key, &t->dv_entries)) {
struct tm datetime;
extractDVdate(&t->dv_entries, key, &offset, &datetime);
device_date_time_ = strdatetime(&datetime);
t->addMoreExplanation(offset, " device datetime (%s)", device_date_time_.c_str());
}
}

1
src/meters.h
Wyświetl plik

@ -66,7 +66,6 @@ LIST_OF_METER_TYPES
X(multical403,C1_bit, HeatMeter, MULTICAL403, Multical403) \
X(multical602,C1_bit, HeatMeter, MULTICAL602, Multical602) \
X(multical803,C1_bit, HeatMeter, MULTICAL803, Multical803) \
X(rfmamb, T1_bit, TempHygroMeter, RFMAMB, RfmAmb) \
X(rfmtx1, T1_bit, WaterMeter, RFMTX1, RfmTX1) \

4
tests/test_serial_bads.sh
Wyświetl plik

@ -12,7 +12,7 @@ TESTRESULT="ERROR"
cat > $TEST/test_expected.txt <<EOF
{"media":"room sensor","meter":"lansenth","name":"Rummet1","id":"00010203","status":"PERMANENT_ERROR SABOTAGE_ENCLOSURE","current_temperature_c":21.8,"current_relative_humidity_rh":43,"average_temperature_1h_c":21.79,"average_relative_humidity_1h_rh":43,"average_temperature_24h_c":21.97,"average_relative_humidity_24h_rh":42.5,"timestamp":"1111-11-11T11:11:11Z"}
{"media":"room sensor","meter":"rfmamb","name":"Rummet2","id":"11772288","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"minimum_temperature_1h_c":21.85,"maximum_temperature_24h_c":23.47,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"minimum_relative_humidity_1h_rh":42.2,"maximum_relative_humidity_1h_rh":50.1,"maximum_relative_humidity_24h_rh":0,"minimum_relative_humidity_24h_rh":0,"device_date_time":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z"}
{"media":"room sensor","meter":"rfmamb","name":"Rummet2","id":"11772288","status":"PERMANENT_ERROR","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"maximum_temperature_24h_c":23.47,"minimum_temperature_1h_c":21.85,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"maximum_relative_humidity_1h_rh":44.2,"maximum_relative_humidity_24h_rh":50.1,"minimum_relative_humidity_1h_rh":42.5,"minimum_relative_humidity_24h_rh":42.2,"device_datetime":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z"}
EOF
xxd -r -p simulations/serial_rawtty_ok.hex | \
@ -40,7 +40,7 @@ TESTNAME="Test bad serial rawtty telegram with interspersed noise, on stdin"
TESTRESULT="ERROR"
cat > $TEST/test_expected.txt <<EOF
{"media":"room sensor","meter":"rfmamb","name":"Rummet2","id":"11772288","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"minimum_temperature_1h_c":21.85,"maximum_temperature_24h_c":23.47,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"minimum_relative_humidity_1h_rh":42.2,"maximum_relative_humidity_1h_rh":50.1,"maximum_relative_humidity_24h_rh":0,"minimum_relative_humidity_24h_rh":0,"device_date_time":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z"}
{"media":"room sensor","meter":"rfmamb","name":"Rummet2","id":"11772288","status":"PERMANENT_ERROR","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"maximum_temperature_24h_c":23.47,"minimum_temperature_1h_c":21.85,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"maximum_relative_humidity_1h_rh":44.2,"maximum_relative_humidity_24h_rh":50.1,"minimum_relative_humidity_1h_rh":42.5,"minimum_relative_humidity_24h_rh":42.2,"device_datetime":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z"}
EOF
xxd -r -p simulations/serial_rawtty_bad.hex | $PROG --silent --format=json --listento=any stdin Rummet1 lansenth 00010203 "" Rummet2 rfmamb 11772288 "" | grep Rummet > $TEST/test_output.txt

12
tests/test_stdin_and_file.sh
Wyświetl plik

@ -12,7 +12,7 @@ TESTRESULT="ERROR"
cat > $TEST/test_expected.txt <<EOF
{"media":"room sensor","meter":"lansenth","name":"Rummet1","id":"00010203","status":"PERMANENT_ERROR SABOTAGE_ENCLOSURE","current_temperature_c":21.8,"current_relative_humidity_rh":43,"average_temperature_1h_c":21.79,"average_relative_humidity_1h_rh":43,"average_temperature_24h_c":21.97,"average_relative_humidity_24h_rh":42.5,"timestamp":"1111-11-11T11:11:11Z"}
{"media":"room sensor","meter":"rfmamb","name":"Rummet2","id":"11772288","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"minimum_temperature_1h_c":21.85,"maximum_temperature_24h_c":23.47,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"minimum_relative_humidity_1h_rh":42.2,"maximum_relative_humidity_1h_rh":50.1,"maximum_relative_humidity_24h_rh":0,"minimum_relative_humidity_24h_rh":0,"device_date_time":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z"}
{"media":"room sensor","meter":"rfmamb","name":"Rummet2","id":"11772288","status":"PERMANENT_ERROR","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"maximum_temperature_24h_c":23.47,"minimum_temperature_1h_c":21.85,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"maximum_relative_humidity_1h_rh":44.2,"maximum_relative_humidity_24h_rh":50.1,"minimum_relative_humidity_1h_rh":42.5,"minimum_relative_humidity_24h_rh":42.2,"device_datetime":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z"}
EOF
xxd -r -p simulations/serial_rawtty_ok.hex | \
@ -43,7 +43,7 @@ xxd -r -p simulations/serial_rawtty_ok.hex > $TEST/test_raw
cat > $TEST/test_expected.txt <<EOF
{"media":"room sensor","meter":"lansenth","name":"Rummet1","id":"00010203","status":"PERMANENT_ERROR SABOTAGE_ENCLOSURE","current_temperature_c":21.8,"current_relative_humidity_rh":43,"average_temperature_1h_c":21.79,"average_relative_humidity_1h_rh":43,"average_temperature_24h_c":21.97,"average_relative_humidity_24h_rh":42.5,"timestamp":"1111-11-11T11:11:11Z"}
{"media":"room sensor","meter":"rfmamb","name":"Rummet2","id":"11772288","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"minimum_temperature_1h_c":21.85,"maximum_temperature_24h_c":23.47,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"minimum_relative_humidity_1h_rh":42.2,"maximum_relative_humidity_1h_rh":50.1,"maximum_relative_humidity_24h_rh":0,"minimum_relative_humidity_24h_rh":0,"device_date_time":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z"}
{"media":"room sensor","meter":"rfmamb","name":"Rummet2","id":"11772288","status":"PERMANENT_ERROR","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"maximum_temperature_24h_c":23.47,"minimum_temperature_1h_c":21.85,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"maximum_relative_humidity_1h_rh":44.2,"maximum_relative_humidity_24h_rh":50.1,"minimum_relative_humidity_1h_rh":42.5,"minimum_relative_humidity_24h_rh":42.2,"device_datetime":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z"}
EOF
$PROG --silent --format=json --listento=any $TEST/test_raw \
@ -70,7 +70,7 @@ TESTRESULT="ERROR"
cat > $TEST/test_expected.txt <<EOF
{"media":"room sensor","meter":"lansenth","name":"Rummet1","id":"00010203","status":"PERMANENT_ERROR SABOTAGE_ENCLOSURE","current_temperature_c":21.8,"current_relative_humidity_rh":43,"average_temperature_1h_c":21.79,"average_relative_humidity_1h_rh":43,"average_temperature_24h_c":21.97,"average_relative_humidity_24h_rh":42.5,"timestamp":"1111-11-11T11:11:11Z","device":"rtlwmbus[]","rssi_dbm":97}
{"media":"room sensor","meter":"rfmamb","name":"Rummet2","id":"11772288","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"minimum_temperature_1h_c":21.85,"maximum_temperature_24h_c":23.47,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"minimum_relative_humidity_1h_rh":42.2,"maximum_relative_humidity_1h_rh":50.1,"maximum_relative_humidity_24h_rh":0,"minimum_relative_humidity_24h_rh":0,"device_date_time":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z","device":"rtlwmbus[]","rssi_dbm":97}
{"media":"room sensor","meter":"rfmamb","name":"Rummet2","id":"11772288","status":"PERMANENT_ERROR","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"maximum_temperature_24h_c":23.47,"minimum_temperature_1h_c":21.85,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"maximum_relative_humidity_1h_rh":44.2,"maximum_relative_humidity_24h_rh":50.1,"minimum_relative_humidity_1h_rh":42.5,"minimum_relative_humidity_24h_rh":42.2,"device_datetime":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z","device":"rtlwmbus[]","rssi_dbm":97}
EOF
cat simulations/serial_rtlwmbus_ok.msg | \
@ -98,7 +98,7 @@ TESTRESULT="ERROR"
cat > $TEST/test_expected.txt <<EOF
{"media":"room sensor","meter":"lansenth","name":"Rummet1","id":"00010203","status":"PERMANENT_ERROR SABOTAGE_ENCLOSURE","current_temperature_c":21.8,"current_relative_humidity_rh":43,"average_temperature_1h_c":21.79,"average_relative_humidity_1h_rh":43,"average_temperature_24h_c":21.97,"average_relative_humidity_24h_rh":42.5,"timestamp":"1111-11-11T11:11:11Z","device":"rtlwmbus[]","rssi_dbm":97}
{"media":"room sensor","meter":"rfmamb","name":"Rummet2","id":"11772288","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"minimum_temperature_1h_c":21.85,"maximum_temperature_24h_c":23.47,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"minimum_relative_humidity_1h_rh":42.2,"maximum_relative_humidity_1h_rh":50.1,"maximum_relative_humidity_24h_rh":0,"minimum_relative_humidity_24h_rh":0,"device_date_time":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z","device":"rtlwmbus[]","rssi_dbm":97}
{"media":"room sensor","meter":"rfmamb","name":"Rummet2","id":"11772288","status":"PERMANENT_ERROR","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"maximum_temperature_24h_c":23.47,"minimum_temperature_1h_c":21.85,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"maximum_relative_humidity_1h_rh":44.2,"maximum_relative_humidity_24h_rh":50.1,"minimum_relative_humidity_1h_rh":42.5,"minimum_relative_humidity_24h_rh":42.2,"device_datetime":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z","device":"rtlwmbus[]","rssi_dbm":97}
EOF
$PROG --silent --format=json --listento=any simulations/serial_rtlwmbus_ok.msg:rtlwmbus \
@ -123,7 +123,7 @@ TESTRESULT="ERROR"
cat > $TEST/test_expected.txt <<EOF
{"media":"room sensor","meter":"lansenth","name":"Rummet1","id":"00010203","status":"PERMANENT_ERROR SABOTAGE_ENCLOSURE","current_temperature_c":21.8,"current_relative_humidity_rh":43,"average_temperature_1h_c":21.79,"average_relative_humidity_1h_rh":43,"average_temperature_24h_c":21.97,"average_relative_humidity_24h_rh":42.5,"timestamp":"1111-11-11T11:11:11Z","device":"rtl433[]","rssi_dbm":999}
{"media":"room sensor","meter":"rfmamb","name":"Rummet2","id":"11772288","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"minimum_temperature_1h_c":21.85,"maximum_temperature_24h_c":23.47,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"minimum_relative_humidity_1h_rh":42.2,"maximum_relative_humidity_1h_rh":50.1,"maximum_relative_humidity_24h_rh":0,"minimum_relative_humidity_24h_rh":0,"device_date_time":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z","device":"rtl433[]","rssi_dbm":999}
{"media":"room sensor","meter":"rfmamb","name":"Rummet2","id":"11772288","status":"PERMANENT_ERROR","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"maximum_temperature_24h_c":23.47,"minimum_temperature_1h_c":21.85,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"maximum_relative_humidity_1h_rh":44.2,"maximum_relative_humidity_24h_rh":50.1,"minimum_relative_humidity_1h_rh":42.5,"minimum_relative_humidity_24h_rh":42.2,"device_datetime":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z","device":"rtl433[]","rssi_dbm":999}
EOF
cat simulations/serial_rtl433_ok.msg | \
@ -151,7 +151,7 @@ TESTRESULT="ERROR"
cat > $TEST/test_expected.txt <<EOF
{"media":"room sensor","meter":"lansenth","name":"Rummet1","id":"00010203","status":"PERMANENT_ERROR SABOTAGE_ENCLOSURE","current_temperature_c":21.8,"current_relative_humidity_rh":43,"average_temperature_1h_c":21.79,"average_relative_humidity_1h_rh":43,"average_temperature_24h_c":21.97,"average_relative_humidity_24h_rh":42.5,"timestamp":"1111-11-11T11:11:11Z","device":"rtl433[]","rssi_dbm":999}
{"media":"room sensor","meter":"rfmamb","name":"Rummet2","id":"11772288","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"minimum_temperature_1h_c":21.85,"maximum_temperature_24h_c":23.47,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"minimum_relative_humidity_1h_rh":42.2,"maximum_relative_humidity_1h_rh":50.1,"maximum_relative_humidity_24h_rh":0,"minimum_relative_humidity_24h_rh":0,"device_date_time":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z","device":"rtl433[]","rssi_dbm":999}
{"media":"room sensor","meter":"rfmamb","name":"Rummet2","id":"11772288","status":"PERMANENT_ERROR","current_temperature_c":22.08,"average_temperature_1h_c":21.91,"average_temperature_24h_c":22.07,"maximum_temperature_1h_c":22.08,"maximum_temperature_24h_c":23.47,"minimum_temperature_1h_c":21.85,"minimum_temperature_24h_c":21.29,"current_relative_humidity_rh":44.2,"average_relative_humidity_1h_rh":43.2,"average_relative_humidity_24h_rh":44.5,"maximum_relative_humidity_1h_rh":44.2,"maximum_relative_humidity_24h_rh":50.1,"minimum_relative_humidity_1h_rh":42.5,"minimum_relative_humidity_24h_rh":42.2,"device_datetime":"2019-10-11 19:59","timestamp":"1111-11-11T11:11:11Z","device":"rtl433[]","rssi_dbm":999}
EOF
$PROG --silent --format=json --listento=any simulations/serial_rtl433_ok.msg:rtl433 \