kopia lustrzana https://github.com/weetmuts/wmbusmeters
Refactor iperl driver.
Fredrik Öhrström
rodzic
65cc9f3846
commit
7bf811dd67
|
|
@ -0,0 +1,101 @@
|
|||
/*
|
||||
Copyright (C) 2017-2022 Fredrik Öhrström
|
||||
Copyright (C) 2018 David Mallon
|
||||
|
||||
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"
|
||||
|
||||
using namespace std;
|
||||
|
||||
struct MeterIperl : public virtual MeterCommonImplementation
|
||||
{
|
||||
MeterIperl(MeterInfo &mi, DriverInfo &di);
|
||||
|
||||
private:
|
||||
|
||||
double total_water_consumption_m3_ {};
|
||||
double max_flow_m3h_ {};
|
||||
};
|
||||
|
||||
static bool ok = registerDriver([](DriverInfo&di)
|
||||
{
|
||||
di.setName("iperl");
|
||||
di.setMeterType(MeterType::WaterMeter);
|
||||
di.setExpectedTPLSecurityMode(TPLSecurityMode::AES_CBC_IV);
|
||||
di.addLinkMode(LinkMode::T1);
|
||||
di.addDetection(MANUFACTURER_SEN, 0x06, 0x68);
|
||||
di.addDetection(MANUFACTURER_SEN, 0x07, 0x68);
|
||||
di.addDetection(MANUFACTURER_SEN, 0x07, 0x7c);
|
||||
di.setConstructor([](MeterInfo& mi, DriverInfo& di){ return shared_ptr<Meter>(new MeterIperl(mi, di)); });
|
||||
});
|
||||
|
||||
MeterIperl::MeterIperl(MeterInfo &mi, DriverInfo &di) : MeterCommonImplementation(mi, di)
|
||||
{
|
||||
setMeterType(MeterType::WaterMeter);
|
||||
|
||||
setExpectedTPLSecurityMode(TPLSecurityMode::AES_CBC_IV);
|
||||
|
||||
addLinkMode(LinkMode::T1);
|
||||
|
||||
// version 0x68
|
||||
// version 0x7c Sensus 640
|
||||
|
||||
addFieldWithExtractor(
|
||||
"total",
|
||||
Quantity::Volume,
|
||||
NoDifVifKey,
|
||||
VifScaling::Auto,
|
||||
MeasurementType::Instantaneous,
|
||||
ValueInformation::Volume,
|
||||
StorageNr(0),
|
||||
TariffNr(0),
|
||||
IndexNr(1),
|
||||
PrintProperty::JSON | PrintProperty::FIELD | PrintProperty::IMPORTANT,
|
||||
"The total water consumption recorded by this meter.",
|
||||
SET_FUNC(total_water_consumption_m3_, Unit::M3),
|
||||
GET_FUNC(total_water_consumption_m3_, Unit::M3));
|
||||
|
||||
addFieldWithExtractor(
|
||||
"max_flow",
|
||||
Quantity::Flow,
|
||||
NoDifVifKey,
|
||||
VifScaling::Auto,
|
||||
MeasurementType::Instantaneous,
|
||||
ValueInformation::VolumeFlow,
|
||||
StorageNr(0),
|
||||
TariffNr(0),
|
||||
IndexNr(1),
|
||||
PrintProperty::JSON | PrintProperty::FIELD | PrintProperty::IMPORTANT,
|
||||
"The maxium flow recorded during previous period.",
|
||||
SET_FUNC(max_flow_m3h_, Unit::M3H),
|
||||
GET_FUNC(max_flow_m3h_, Unit::M3H));
|
||||
}
|
||||
|
||||
// Test: MoreWater iperl 12345699 NOKEY
|
||||
// Comment: Test iPerl T1 telegram, that after decryption, has 2f2f markers.
|
||||
// telegram=|1E44AE4C9956341268077A36001000#2F2F0413181E0000023B00002F2F2F2F|
|
||||
// {"media":"water","meter":"iperl","name":"MoreWater","id":"12345699","total_m3":7.704,"max_flow_m3h":0,"timestamp":"1111-11-11T11:11:11Z"}
|
||||
// |MoreWater;12345699;7.704000;0.000000;1111-11-11 11:11.11
|
||||
|
||||
// Test: WaterWater iperl 33225544 NOKEY
|
||||
// Comment: Test iPerl T1 telegram not encrypted, which has no 2f2f markers.
|
||||
// telegram=|1844AE4C4455223368077A55000000|041389E20100023B0000|
|
||||
// {"media":"water","meter":"iperl","name":"WaterWater","id":"33225544","total_m3":123.529,"max_flow_m3h":0,"timestamp":"1111-11-11T11:11:11Z"}
|
||||
// |WaterWater;33225544;123.529000;0.000000;1111-11-11 11:11.11
|
||||
|
|
@ -55,9 +55,6 @@
|
|||
X(HYDRODIGIT,MANUFACTURER_BMT, 0x06, 0x13) \
|
||||
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) \
|
||||
X(IZAR, MANUFACTURER_HYD, 0x07, 0x85) \
|
||||
X(IZAR, MANUFACTURER_SAP, 0x15, -1) \
|
||||
X(IZAR, MANUFACTURER_SAP, 0x04, -1) \
|
||||
|
|
|
|||
|
|
@ -1,107 +0,0 @@
|
|||
/*
|
||||
Copyright (C) 2017-2020 Fredrik Öhrström
|
||||
Copyright (C) 2018 David Mallon
|
||||
|
||||
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"
|
||||
|
||||
using namespace std;
|
||||
|
||||
struct MeterIperl : public virtual MeterCommonImplementation {
|
||||
MeterIperl(MeterInfo &mi);
|
||||
|
||||
// Total water counted through the meter
|
||||
double totalWaterConsumption(Unit u);
|
||||
bool hasTotalWaterConsumption();
|
||||
double maxFlow(Unit u);
|
||||
bool hasMaxFlow();
|
||||
|
||||
private:
|
||||
void processContent(Telegram *t);
|
||||
|
||||
double total_water_consumption_m3_ {};
|
||||
double max_flow_m3h_ {};
|
||||
};
|
||||
|
||||
MeterIperl::MeterIperl(MeterInfo &mi) :
|
||||
MeterCommonImplementation(mi, "iperl")
|
||||
{
|
||||
setMeterType(MeterType::WaterMeter);
|
||||
|
||||
setExpectedTPLSecurityMode(TPLSecurityMode::AES_CBC_IV);
|
||||
|
||||
addLinkMode(LinkMode::T1);
|
||||
|
||||
// version 0x68
|
||||
// version 0x7c Sensus 640
|
||||
|
||||
addPrint("total", Quantity::Volume,
|
||||
[&](Unit u){ return totalWaterConsumption(u); },
|
||||
"The total water consumption recorded by this meter.",
|
||||
true, true);
|
||||
|
||||
addPrint("max_flow", Quantity::Flow,
|
||||
[&](Unit u){ return maxFlow(u); },
|
||||
"The maxium flow recorded during previous period.",
|
||||
true, true);
|
||||
}
|
||||
|
||||
shared_ptr<Meter> createIperl(MeterInfo &mi)
|
||||
{
|
||||
return shared_ptr<Meter>(new MeterIperl(mi));
|
||||
}
|
||||
|
||||
void MeterIperl::processContent(Telegram *t)
|
||||
{
|
||||
int offset;
|
||||
string key;
|
||||
|
||||
if(findKey(MeasurementType::Unknown, ValueInformation::Volume, 0, 0, &key, &t->values)) {
|
||||
extractDVdouble(&t->values, key, &offset, &total_water_consumption_m3_);
|
||||
t->addMoreExplanation(offset, " total consumption (%f m3)", total_water_consumption_m3_);
|
||||
}
|
||||
|
||||
if(findKey(MeasurementType::Unknown, ValueInformation::VolumeFlow, ANY_STORAGENR, 0, &key, &t->values)) {
|
||||
extractDVdouble(&t->values, key, &offset, &max_flow_m3h_);
|
||||
t->addMoreExplanation(offset, " max flow (%f m3/h)", max_flow_m3h_);
|
||||
}
|
||||
}
|
||||
|
||||
double MeterIperl::totalWaterConsumption(Unit u)
|
||||
{
|
||||
assertQuantity(u, Quantity::Volume);
|
||||
return convert(total_water_consumption_m3_, Unit::M3, u);
|
||||
}
|
||||
|
||||
bool MeterIperl::hasTotalWaterConsumption()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
double MeterIperl::maxFlow(Unit u)
|
||||
{
|
||||
assertQuantity(u, Quantity::Flow);
|
||||
return convert(max_flow_m3h_, Unit::M3H, u);
|
||||
}
|
||||
|
||||
bool MeterIperl::hasMaxFlow()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
|
@ -72,7 +72,6 @@ LIST_OF_METER_TYPES
|
|||
X(hydrus, T1_bit, WaterMeter, HYDRUS, Hydrus) \
|
||||
X(hydrocalm3, T1_bit, HeatMeter, HYDROCALM3, HydrocalM3) \
|
||||
X(hydrodigit, T1_bit, WaterMeter, HYDRODIGIT, Hydrodigit) \
|
||||
X(iperl, T1_bit, WaterMeter, IPERL, Iperl) \
|
||||
X(izar, T1_bit, WaterMeter, IZAR, Izar) \
|
||||
X(izar3, T1_bit, WaterMeter, IZAR3, Izar3) \
|
||||
X(lansensm, T1_bit, SmokeDetector, LANSENSM, LansenSM) \
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ echo "Testing drivers"
|
|||
TESTNAME="Test driver tests"
|
||||
TESTRESULT="ERROR"
|
||||
|
||||
ALL_DRIVERS=$(cd src; echo meter_*cc)
|
||||
ALL_DRIVERS=$(cd src; echo driver_*cc)
|
||||
DRIVERS=
|
||||
|
||||
for i in $ALL_DRIVERS
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue