kopia lustrzana https://github.com/weetmuts/wmbusmeters
Added aptor172 driver.
rodzic
536239670f
commit
467e71ebfc
1
CHANGES
1
CHANGES
|
@ -12,6 +12,7 @@ from /var/log/wmbusmeters/meter_readings to /var/lib/wmbusmeters/meter_readings
|
|||
This only affects new installations. Existing conf files will use the old location
|
||||
as specified int the conf file.
|
||||
|
||||
Added apator172 water meter.
|
||||
Added qualcosonic heating/cooling meter.
|
||||
Added ei6500 smoke detector.
|
||||
Added kampress pressure sensor.
|
||||
|
|
2
Makefile
2
Makefile
|
@ -109,7 +109,7 @@ endif
|
|||
$(info Building $(VERSION))
|
||||
|
||||
FUZZFLAGS ?= -DFUZZING=false
|
||||
CXXFLAGS ?= $(DEBUG_FLAGS) $(FUZZFLAGS) -fPIC -std=c++11 -Wall -Werror=format-security
|
||||
CXXFLAGS ?= $(DEBUG_FLAGS) $(FUZZFLAGS) -fPIC -std=c++11 -Wall -Werror=format-security -Wno-unused-function
|
||||
# Additional fedora rpm package build flags
|
||||
# -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection
|
||||
CXXFLAGS += -I$(BUILD)
|
||||
|
|
|
@ -428,7 +428,8 @@ Any bus controller dongle/board behaving like a plain serial port.
|
|||
Supported water meters:
|
||||
Aventies (aventieswm)
|
||||
Apator at-wmbus-08 (apator08) (non-standard protocol)
|
||||
Apator at-wmbus-16-2 (apator162) (non-standard protocol, spurious decoding errors)
|
||||
Apator at-wmbus-16-2 (apator162) (non-standard protocol)
|
||||
Apator at-wmbus-17-2 (apator172) (non-standard protocol)
|
||||
Apator Ultrimis (ultrimis)
|
||||
Aquametro/Integra Topas Es Kr (topaseskr)
|
||||
Axioma W1 (q400)
|
||||
|
|
|
@ -0,0 +1,85 @@
|
|||
/*
|
||||
Copyright (C) 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"
|
||||
|
||||
#include <cmath>
|
||||
|
||||
namespace
|
||||
{
|
||||
struct Driver : public virtual MeterCommonImplementation
|
||||
{
|
||||
Driver(MeterInfo &mi, DriverInfo &di);
|
||||
|
||||
void processContent(Telegram *t);
|
||||
|
||||
double total_water_consumption_m3_ {};
|
||||
};
|
||||
|
||||
static bool ok = registerDriver([](DriverInfo&di)
|
||||
{
|
||||
di.setName("apator172");
|
||||
di.setMeterType(MeterType::WaterMeter);
|
||||
di.addDetection(0x8614 /*APT?*/, 0x11, 0x04);
|
||||
di.setConstructor([](MeterInfo& mi, DriverInfo& di){ return shared_ptr<Meter>(new Driver(mi, di)); });
|
||||
});
|
||||
|
||||
Driver::Driver(MeterInfo &mi, DriverInfo &di) : MeterCommonImplementation(mi, di)
|
||||
{
|
||||
addPrint("total", Quantity::Volume,
|
||||
[&](Unit u){ return convert(total_water_consumption_m3_, Unit::M3, u); },
|
||||
"The total water consumption recorded by this meter.",
|
||||
PrintProperty::FIELD | PrintProperty::JSON);
|
||||
}
|
||||
|
||||
void Driver::processContent(Telegram *t)
|
||||
{
|
||||
vector<uchar> content;
|
||||
t->extractPayload(&content);
|
||||
|
||||
// Overwrite the non-standard 0x11 with 0x07 which means water.
|
||||
t->dll_type = 0x07;
|
||||
|
||||
map<string,pair<int,DVEntry>> vendor_values;
|
||||
|
||||
size_t i=0;
|
||||
if (i+4 < content.size())
|
||||
{
|
||||
// We found the register representing the total
|
||||
string total;
|
||||
strprintf(total, "%02x%02x%02x%02x", content[i+0], content[i+1], content[i+2], content[i+3]);
|
||||
int offset = i-1+t->header_size;
|
||||
vendor_values["0413"] = {offset, DVEntry(offset, DifVifKey("0413"), MeasurementType::Instantaneous, 0x13, {}, 0, 0, 0, total) };
|
||||
double tmp = 0;
|
||||
extractDVdouble(&vendor_values, "0413", &offset, &tmp);
|
||||
// Single tick seems to be 1/3 of a m3. Divide by 3 and keep a single decimal.
|
||||
// This will report consumption as 100.0 100.3 100.7 101.0 etc.
|
||||
total_water_consumption_m3_ = 0.1*std::round(10000.0*tmp/3.0);
|
||||
total = "*** "+total+" total consumption (%f m3)";
|
||||
t->addSpecialExplanation(offset, 4, KindOfData::CONTENT, Understanding::FULL, total.c_str(), total_water_consumption_m3_);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Test: Vattur apator172 0014a807 NOKEY
|
||||
// telegram=|1C44148607A814000411A0_1D5400000840030000000005FF05D83D0000|
|
||||
// {"media":"water","meter":"apator172","name":"Vattur","id":"0014a807","total_m3":7177.7,"timestamp":"1111-11-11T11:11:11Z"}
|
||||
// |Vattur;0014a807;7177.700000;1111-11-11 11:11.11
|
||||
|
||||
// telegram=|1C44148607A814000411A0_215400000840030000000005FF05D83D0000|
|
||||
// {"media":"water","meter":"apator172","name":"Vattur","id":"0014a807","total_m3":7179,"timestamp":"1111-11-11T11:11:11Z"}
|
||||
// |Vattur;0014a807;7179.000000;1111-11-11 11:11.11
|
Ładowanie…
Reference in New Issue