kopia lustrzana https://github.com/weetmuts/wmbusmeters
Add stuff for QWater5.5
mblnk
rodzic
961b382949
commit
403017f640
1
Makefile
1
Makefile
|
|
@ -181,6 +181,7 @@ METER_OBJS:=\
|
|||
$(BUILD)/meter_piigth.o \
|
||||
$(BUILD)/meter_q400.o \
|
||||
$(BUILD)/meter_qcaloric.o \
|
||||
$(BUILD)/meter_qwater55.o \
|
||||
$(BUILD)/meter_rfmamb.o \
|
||||
$(BUILD)/meter_rfmtx1.o \
|
||||
$(BUILD)/meter_sharky.o \
|
||||
|
|
|
|||
|
|
@ -91,6 +91,7 @@
|
|||
X(TSD2, MANUFACTURER_TCH, 0xf0, 0x76) \
|
||||
X(Q400, MANUFACTURER_AXI, 0x07, 0x10) \
|
||||
X(QCALORIC, MANUFACTURER_QDS, 0x08, 0x35) \
|
||||
X(QWATER55, MANUFACTURER_LSE, 0x07, 0x17) \
|
||||
X(SHARKY, MANUFACTURER_HYD, 0x04, 0x20) \
|
||||
X(SUPERCOM587,MANUFACTURER_SON, 0x06, 0x3c) \
|
||||
X(SUPERCOM587,MANUFACTURER_SON, 0x07, 0x3c) \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,212 @@
|
|||
/*
|
||||
Copyright (C) 2021 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"util.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
struct MeterQWater55 : public virtual WaterMeter, public virtual MeterCommonImplementation {
|
||||
MeterQWater55(MeterInfo &mi);
|
||||
|
||||
// Total water counted through the meter
|
||||
double totalWaterConsumption(Unit u);
|
||||
bool hasTotalWaterConsumption();
|
||||
|
||||
// Water conumption at due date
|
||||
double dueDateWaterConsumption(Unit u);
|
||||
// The configured due date
|
||||
string dueDate();
|
||||
|
||||
// Not shure about this one, should be error codes and 0 otherwise
|
||||
string errorCode();
|
||||
// Date of the error, if no error occured it is 2127-15-31 (FFFF)
|
||||
string errorDate();
|
||||
|
||||
// Date and time of the device, presumably in UTC
|
||||
string deviceDateTime();
|
||||
|
||||
private:
|
||||
void processContent(Telegram *t);
|
||||
|
||||
double total_water_consumption_m3_ {};
|
||||
|
||||
double due_date_water_consumption_m3_ {};
|
||||
string due_date_ {};
|
||||
|
||||
ushort error_code_ {};
|
||||
string error_date_ {};
|
||||
|
||||
string device_date_time_ {};
|
||||
|
||||
};
|
||||
|
||||
shared_ptr<WaterMeter> createQWater55(MeterInfo &mi)
|
||||
{
|
||||
return shared_ptr<WaterMeter>(new MeterQWater55(mi));
|
||||
}
|
||||
|
||||
MeterQWater55::MeterQWater55(MeterInfo &mi) :
|
||||
MeterCommonImplementation(mi, MeterDriver::QWATER55)
|
||||
{
|
||||
setExpectedTPLSecurityMode(TPLSecurityMode::AES_CBC_IV);
|
||||
|
||||
addLinkMode(LinkMode::S1);
|
||||
|
||||
addPrint("total", Quantity::Volume,
|
||||
[&](Unit u){ return totalWaterConsumption(u); },
|
||||
"The total water consumption recorded by this meter.",
|
||||
true, true);
|
||||
addPrint("due_date", Quantity::Volume,
|
||||
[&](Unit u){ return dueDateWaterConsumption(u); },
|
||||
"The water consumption at the due date.",
|
||||
true, true);
|
||||
addPrint("due_date", Quantity::Text,
|
||||
[&](){ return dueDate(); },
|
||||
"The due date configured on the meter.",
|
||||
true, true);
|
||||
addPrint("error_code", Quantity::Text,
|
||||
[&](){ return errorCode(); },
|
||||
"Error code of the Meter, 0 means no error.",
|
||||
true, true);
|
||||
addPrint("error_date", Quantity::Text,
|
||||
[&](){ return errorDate(); },
|
||||
"The date the error occured at. If no error, reads 2127-15-31 (FFFF).",
|
||||
true, true);
|
||||
addPrint("device_date_time", Quantity::Text,
|
||||
[&](){ return deviceDateTime(); },
|
||||
"Error code of the Meter, 0 means no error.",
|
||||
true, true);
|
||||
|
||||
}
|
||||
|
||||
void MeterQWater55::processContent(Telegram *t)
|
||||
{
|
||||
/*
|
||||
The following telegram corresponds to the Qundis QWater5.5 cold water meters I have here.
|
||||
From the device display it states that it is set to S-mode operation, sending a telegram
|
||||
every 4 h.
|
||||
Another option of this device is the C mode operation, sending telegrams every
|
||||
7.5 s.
|
||||
|
||||
Even though my meters are definitely Qundis QWater5.5, the meters do not identify with
|
||||
manufacturer code QDS but with LSE.
|
||||
|
||||
(qwater55) 0f: 0C dif (8 digit BCD Instantaneous value)
|
||||
(qwater55) 10: 13 vif (Volume l)
|
||||
(qwater55) 11: * 04400100 total consumption (14.004000 m3)
|
||||
(qwater55) 15: 4C dif (8 digit BCD Instantaneous value storagenr=1)
|
||||
(qwater55) 16: 13 vif (Volume l)
|
||||
(qwater55) 17: * 40620000 due date consumption (6.240000 m3)
|
||||
(qwater55) 1b: 42 dif (16 Bit Integer/Binary Instantaneous value storagenr=1)
|
||||
(qwater55) 1c: 6C vif (Date type G)
|
||||
(qwater55) 1d: * 9F2C due date (2020-12-31)
|
||||
(qwater55) 1f: 02 dif (16 Bit Integer/Binary Instantaneous value)
|
||||
(qwater55) 20: BB vif (Volume flow l/h)
|
||||
(qwater55) 21: 56 vife (duration of limit exceed last lower is 2)
|
||||
(qwater55) 22: * 0000 error code (0)
|
||||
(qwater55) 24: 32 dif (16 Bit Integer/Binary Value during error state)
|
||||
(qwater55) 25: 6C vif (Date type G)
|
||||
(qwater55) 26: * FFFF error date (2127-15-31)
|
||||
(qwater55) 28: 04 dif (32 Bit Integer/Binary Instantaneous value)
|
||||
(qwater55) 29: 6D vif (Date and time type)
|
||||
(qwater55) 2a: * 180DA924 device datetime (2021-04-09 13:24)
|
||||
*/
|
||||
|
||||
int offset;
|
||||
string key;
|
||||
|
||||
if (findKey(MeasurementType::Instantaneous, 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::Instantaneous, ValueInformation::Volume, 1, 0, &key, &t->values)) {
|
||||
extractDVdouble(&t->values, key, &offset, &due_date_water_consumption_m3_);
|
||||
t->addMoreExplanation(offset, " due date consumption (%f m3)", due_date_water_consumption_m3_);
|
||||
}
|
||||
if (findKey(MeasurementType::Instantaneous, ValueInformation::Date, 1, 0, &key, &t->values)) {
|
||||
struct tm date;
|
||||
extractDVdate(&t->values, key, &offset, &date);
|
||||
due_date_ = strdate(&date);
|
||||
t->addMoreExplanation(offset, " due date (%s)", due_date_.c_str());
|
||||
}
|
||||
|
||||
key = "02BB56";
|
||||
if (hasKey(&t->values, key)) {
|
||||
extractDVuint16(&t->values, key, &offset, &error_code_);
|
||||
// Not sure about this one, is it error codes or sth else?
|
||||
t->addMoreExplanation(offset, " error code (%d)", error_code_);
|
||||
}
|
||||
|
||||
if (findKey(MeasurementType::AtError, ValueInformation::Date, 0, 0, &key, &t->values)) {
|
||||
struct tm date;
|
||||
extractDVdate(&t->values, key, &offset, &date);
|
||||
error_date_ = strdate(&date);
|
||||
t->addMoreExplanation(offset, " error date (%s)", error_date_.c_str());
|
||||
}
|
||||
|
||||
if (findKey(MeasurementType::Instantaneous, ValueInformation::DateTime, 0, 0, &key, &t->values)) {
|
||||
struct tm datetime;
|
||||
extractDVdate(&t->values, key, &offset, &datetime);
|
||||
device_date_time_ = strdatetime(&datetime);
|
||||
t->addMoreExplanation(offset, " device datetime (%s)", device_date_time_.c_str());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
double MeterQWater55::totalWaterConsumption(Unit u)
|
||||
{
|
||||
assertQuantity(u, Quantity::Volume);
|
||||
return convert(total_water_consumption_m3_, Unit::M3, u);
|
||||
}
|
||||
|
||||
bool MeterQWater55::hasTotalWaterConsumption()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
double MeterQWater55::dueDateWaterConsumption(Unit u)
|
||||
{
|
||||
assertQuantity(u, Quantity::Volume);
|
||||
return convert(due_date_water_consumption_m3_, Unit::M3, u);
|
||||
}
|
||||
|
||||
string MeterQWater55::dueDate()
|
||||
{
|
||||
return due_date_;
|
||||
}
|
||||
|
||||
string MeterQWater55::errorCode()
|
||||
{
|
||||
string status = to_string(error_code_);
|
||||
return status;
|
||||
}
|
||||
|
||||
string MeterQWater55::errorDate()
|
||||
{
|
||||
return error_date_;
|
||||
}
|
||||
|
||||
string MeterQWater55::deviceDateTime()
|
||||
{
|
||||
return device_date_time_;
|
||||
}
|
||||
|
||||
|
|
@ -75,6 +75,7 @@
|
|||
X(tsd2, T1_bit, SmokeDetector, TSD2, TSD2) \
|
||||
X(q400, T1_bit, WaterMeter, Q400, Q400) \
|
||||
X(qcaloric, C1_bit, HeatCostAllocationMeter, QCALORIC, QCaloric) \
|
||||
X(qwater55, S1_bit, WaterMeter, QWATER55, QWater55) \
|
||||
X(sensostar, C1_bit|T1_bit, HeatMeter,SENSOSTAR, Sensostar) \
|
||||
X(sharky, T1_bit, HeatMeter, SHARKY, Sharky) \
|
||||
X(sontex868, T1_bit, HeatCostAllocationMeter, SONTEX868, Sontex868) \
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue