kopia lustrzana https://github.com/weetmuts/wmbusmeters
Normalize field names in mkradio4a and vario411.
Fredrik Öhrström
rodzic
d823287512
commit
560a733dfd
|
|
@ -1,7 +1,5 @@
|
|||
/*
|
||||
Copyright (C) 2017-2022 Fredrik Öhrström (gpl-3.0-or-later)
|
||||
Copyright (C) 2018 David Mallon (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
|
||||
|
|
@ -30,7 +28,7 @@ namespace
|
|||
|
||||
{
|
||||
di.setName("mkradio4a");
|
||||
di.setDefaultFields("name,id,previous_m3,timestamp");
|
||||
di.setDefaultFields("name,id,target_m3,target_date,timestamp");
|
||||
di.setMeterType(MeterType::WaterMeter);
|
||||
di.addLinkMode(LinkMode::T1);
|
||||
di.addLinkMode(LinkMode::C1);
|
||||
|
|
@ -45,35 +43,39 @@ namespace
|
|||
setExpectedTPLSecurityMode(TPLSecurityMode::AES_CBC_IV);
|
||||
|
||||
addNumericFieldWithExtractor(
|
||||
"Water_previous",
|
||||
"The total water consumption recorded at the end of previous billing period.",
|
||||
PrintProperty::JSON | PrintProperty::FIELD | PrintProperty::IMPORTANT,
|
||||
"target",
|
||||
"The total water consumption recorded at the end of previous year.",
|
||||
PrintProperty::JSON | PrintProperty::IMPORTANT,
|
||||
Quantity::Volume,
|
||||
VifScaling::Auto,
|
||||
FieldMatcher::build()
|
||||
.set(MeasurementType::Instantaneous)
|
||||
.set(VIFRange::Volume)
|
||||
.set(StorageNr(1))
|
||||
.set(DifVifKey("4315"))
|
||||
);
|
||||
|
||||
addStringFieldWithExtractor(
|
||||
"Previous_date",
|
||||
"Date when previous billing period ended.",
|
||||
PrintProperty::JSON | PrintProperty::FIELD ,
|
||||
addNumericFieldWithExtractor(
|
||||
"target",
|
||||
"Date when previous year ended.",
|
||||
PrintProperty::JSON,
|
||||
Quantity::PointInTime,
|
||||
VifScaling::Auto,
|
||||
FieldMatcher::build()
|
||||
.set(MeasurementType::Instantaneous)
|
||||
.set(VIFRange::Date)
|
||||
.set(DifVifKey("426C"))
|
||||
.set(StorageNr(1))
|
||||
.set(StorageNr(1)),
|
||||
Unit::DateLT
|
||||
);
|
||||
}
|
||||
}
|
||||
//Test: Techem radio4 66953825 NOKEY (Warm water)
|
||||
//telegram=|4B44685036494600953772253895662423FE064E0030052F2F_4315A10000426CBF2C0F542CF2DD8BEC869511B2DB8301C3ABA390FB4FDB6F1144DA1F3897DD55F2AD0D194F68510FF8FADFB9|+38
|
||||
//{"media":"warm water","meter":"mkradio4a","name":"www3","id":"66953825","Water_previous_m3":16.1,"Previous_date":"2021-12-31","timestamp":"2022-11-21T12:07:44Z","device":"rtlwmbus[00000001]","rssi_dbm":82}"
|
||||
|
||||
//Test: Techem radio4 01770002 NOKEY (Cold water)
|
||||
//telegram=|4B4468508644710095377202007701A85CFE078A0030052F2F_4315F00200426CBF2C0FEE456BF6F802216503E25EB73E9377D54F672681B76C469696E4C7BCCC9072CC79F712360FC3F57D85|+72
|
||||
//{"media":"water","meter":"mkradio4a","name":"kww6","id":"01770002","Water_previous_m3":75.2,"Previous_date":"2021-12-31","timestamp":"2022-11-21T12:08:18Z","device": "rtlwmbus[00000001]","rssi_dbm":143}
|
||||
// Test: FOO mkradio4a 66953825 NOKEY
|
||||
// Comment: Warm water
|
||||
// telegram=|4B44685036494600953772253895662423FE064E0030052F2F_4315A10000426CBF2C0F542CF2DD8BEC869511B2DB8301C3ABA390FB4FDB6F1144DA1F3897DD55F2AD0D194F68510FF8FADFB9|
|
||||
// {"media":"warm water","meter":"mkradio4a","name":"FOO","id":"66953825","target_m3":16.1,"target_date":"2021-12-31","timestamp":"1111-11-11T11:11:11Z"}
|
||||
// |FOO;66953825;16.1;2021-12-31;1111-11-11 11:11.11
|
||||
|
||||
// Test: BAR mkradio4a 01770002 NOKEY
|
||||
// Comment: Cold water
|
||||
// telegram=|4B4468508644710095377202007701A85CFE078A0030052F2F_4315F00200426CBF2C0FEE456BF6F802216503E25EB73E9377D54F672681B76C469696E4C7BCCC9072CC79F712360FC3F57D85|
|
||||
// {"media":"water","meter":"mkradio4a","name":"BAR","id":"01770002","target_m3":75.2,"target_date":"2021-12-31","timestamp":"1111-11-11T11:11:11Z"}
|
||||
// |BAR;01770002;75.2;2021-12-31;1111-11-11 11:11.11
|
||||
|
|
|
|||
|
|
@ -17,54 +17,56 @@
|
|||
|
||||
#include"meters_common_implementation.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
struct Driver : public virtual MeterCommonImplementation
|
||||
namespace
|
||||
{
|
||||
Driver(MeterInfo &mi, DriverInfo &di);
|
||||
};
|
||||
struct Driver : public virtual MeterCommonImplementation
|
||||
{
|
||||
Driver(MeterInfo &mi, DriverInfo &di);
|
||||
};
|
||||
|
||||
static bool ok = registerDriver([](DriverInfo&di)
|
||||
{
|
||||
di.setName("vario411");
|
||||
di.setMeterType(MeterType::HeatMeter);
|
||||
di.addLinkMode(LinkMode::C1);
|
||||
di.addLinkMode(LinkMode::T1);
|
||||
di.addDetection(MANUFACTURER_TCH, 0x04, 0x28);
|
||||
di.setConstructor([](MeterInfo& mi, DriverInfo& di){ return shared_ptr<Meter>(new Driver(mi, di)); });
|
||||
});
|
||||
static bool ok = registerDriver([](DriverInfo&di)
|
||||
{
|
||||
di.setName("vario411");
|
||||
di.setDefaultFields("name,id,target_kwh,target_date,timestamp");
|
||||
di.setMeterType(MeterType::HeatMeter);
|
||||
di.addLinkMode(LinkMode::C1);
|
||||
di.addLinkMode(LinkMode::T1);
|
||||
di.addDetection(MANUFACTURER_TCH, 0x04, 0x28);
|
||||
di.setConstructor([](MeterInfo& mi, DriverInfo& di){ return shared_ptr<Meter>(new Driver(mi, di)); });
|
||||
});
|
||||
|
||||
Driver::Driver(MeterInfo &mi, DriverInfo &di) : MeterCommonImplementation(mi, di)
|
||||
{
|
||||
setExpectedTPLSecurityMode(TPLSecurityMode::AES_CBC_NO_IV);
|
||||
Driver::Driver(MeterInfo &mi, DriverInfo &di) : MeterCommonImplementation(mi, di)
|
||||
{
|
||||
setExpectedTPLSecurityMode(TPLSecurityMode::AES_CBC_NO_IV);
|
||||
|
||||
addNumericFieldWithExtractor(
|
||||
"energy_at_old_date",
|
||||
"Total energy consumption at the end of the year",
|
||||
PrintProperty::JSON | PrintProperty::FIELD | PrintProperty::IMPORTANT,
|
||||
Quantity::Energy,
|
||||
VifScaling::Auto,
|
||||
FieldMatcher::build()
|
||||
.set(MeasurementType::Instantaneous)
|
||||
.set(VIFRange::AnyEnergyVIF)
|
||||
.set(StorageNr(1))
|
||||
.set(TariffNr(0))
|
||||
.set(IndexNr(1))
|
||||
.set(DifVifKey("4406"))
|
||||
);
|
||||
addNumericFieldWithExtractor(
|
||||
"target",
|
||||
"Total energy consumption at the end of the year",
|
||||
PrintProperty::JSON | PrintProperty::FIELD | PrintProperty::IMPORTANT,
|
||||
Quantity::Energy,
|
||||
VifScaling::Auto,
|
||||
FieldMatcher::build()
|
||||
.set(MeasurementType::Instantaneous)
|
||||
.set(VIFRange::AnyEnergyVIF)
|
||||
.set(StorageNr(1))
|
||||
);
|
||||
|
||||
addStringFieldWithExtractor(
|
||||
"old_date",
|
||||
"Date at end of previous period",
|
||||
PrintProperty::JSON | PrintProperty::FIELD ,
|
||||
FieldMatcher::build()
|
||||
.set(DifVifKey("426C"))
|
||||
.set(MeasurementType::Instantaneous)
|
||||
.set(VIFRange::Date)
|
||||
.set(StorageNr(1))
|
||||
);
|
||||
addNumericFieldWithExtractor(
|
||||
"target",
|
||||
"Date when previous year ended.",
|
||||
PrintProperty::JSON,
|
||||
Quantity::PointInTime,
|
||||
VifScaling::Auto,
|
||||
FieldMatcher::build()
|
||||
.set(MeasurementType::Instantaneous)
|
||||
.set(VIFRange::Date)
|
||||
.set(StorageNr(1)),
|
||||
Unit::DateLT
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// Test: Techem vario411 67627875 NOKEY
|
||||
//telegram=|624468507578626728048C00F3900F002C25FEEB0600BA84134D9202A1327AFF003007102F2F_4406E1190000426CBF2C0F206730E2E7516874F5DB46B5A97816F575A29A1EA2717D6ADE5C2FE64517ED2B0497EE0FF64C2674CD0832572C484DDFED30|+22
|
||||
//{"media":"heat","meter":"vario411","name":"hw3","id":"67627875","energy_at_old_date_kwh":6625,"old_date":"2021-12-31","timestamp":"2022-11-21T12:41:15Z","device":"rtlwmbus[00000001]","rssi_dbm":114}
|
||||
// Test: Howdy vario411 67627875 NOKEY
|
||||
// telegram=|624468507578626728048C00F3900F002C25FEEB0600BA84134D9202A1327AFF003007102F2F_4406E1190000426CBF2C0F206730E2E7516874F5DB46B5A97816F575A29A1EA2717D6ADE5C2FE64517ED2B0497EE0FF64C2674CD0832572C484DDFED30|
|
||||
// {"id": "67627875","media": "heat","meter": "vario411","name": "Howdy","target_date": "2021-12-31","target_kwh": 6625,"timestamp":"1111-11-11T11:11:11Z"}
|
||||
// |Howdy;67627875;6625;2021-12-31;1111-11-11 11:11.11
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue