kopia lustrzana https://github.com/weetmuts/wmbusmeters
Moved detection mapping into separate file.
Fredrik Öhrström
rodzic
bb259239e9
commit
4169574f4a
|
|
@ -0,0 +1,113 @@
|
|||
/*
|
||||
Copyright (C) 2017-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/>.
|
||||
*/
|
||||
|
||||
// This file is only included into meters.cc
|
||||
//
|
||||
// List of numbers that can be used to detect the meter driver from a telegram.
|
||||
//
|
||||
// meter driver, manufacturer, media, version
|
||||
//
|
||||
#define METER_DETECTION \
|
||||
X(AMIPLUS, MANUFACTURER_APA, 0x02, 0x02) \
|
||||
X(AMIPLUS, MANUFACTURER_DEV, 0x37, 0x02) \
|
||||
X(AMIPLUS, MANUFACTURER_DEV, 0x02, 0x00) \
|
||||
X(APATOR08, 0x8614/*APT?*/, 0x03, 0x03) \
|
||||
X(APATOR162, MANUFACTURER_APA, 0x06, 0x05) \
|
||||
X(APATOR162, MANUFACTURER_APA, 0x07, 0x05) \
|
||||
X(CMA12W, MANUFACTURER_ELV, 0x1b, 0x20) \
|
||||
X(COMPACT5, MANUFACTURER_TCH, 0x04, 0x45) \
|
||||
X(COMPACT5, MANUFACTURER_TCH, 0xc3, 0x45) \
|
||||
X(COMPACT5, MANUFACTURER_TCH, 0x43, 0x22) \
|
||||
X(COMPACT5, MANUFACTURER_TCH, 0x43, 0x45) \
|
||||
X(EBZWMBE, MANUFACTURER_EBZ, 0x37, 0x02) \
|
||||
X(EURISII, MANUFACTURER_INE, 0x08, 0x55) \
|
||||
X(EHZP, MANUFACTURER_EMH, 0x02, 0x02) \
|
||||
X(ESYSWM, MANUFACTURER_ESY, 0x37, 0x30) \
|
||||
X(FLOWIQ2200,MANUFACTURER_KAW, 0x16, 0x3a) \
|
||||
X(FLOWIQ3100,MANUFACTURER_KAM, 0x16, 0x1d) \
|
||||
X(ELF, MANUFACTURER_APA, 0x04, 0x40) \
|
||||
X(EM24, MANUFACTURER_KAM, 0x02, 0x33) \
|
||||
X(EMERLIN868,MANUFACTURER_ELR, 0x37, 0x11) \
|
||||
X(EV200, MANUFACTURER_ELR, 0x07, 0x0d) \
|
||||
X(EVO868, MANUFACTURER_MAD, 0x07, 0x50) \
|
||||
X(FHKVDATAIII,MANUFACTURER_TCH, 0x80, 0x69) \
|
||||
X(FHKVDATAIII,MANUFACTURER_TCH, 0x80, 0x94) \
|
||||
X(FHKVDATAIV,MANUFACTURER_TCH, 0x08, 0x69) \
|
||||
X(FHKVDATAIV,MANUFACTURER_TCH, 0x08, 0x94) \
|
||||
X(HYDRUS, MANUFACTURER_DME, 0x07, 0x70) \
|
||||
X(HYDRUS, MANUFACTURER_HYD, 0x07, 0x24) \
|
||||
X(HYDRUS, MANUFACTURER_DME, 0x06, 0x70) \
|
||||
X(HYDRUS, MANUFACTURER_DME, 0x16, 0x70) \
|
||||
X(HYDROCALM3,MANUFACTURER_BMT, 0x0d, 0x0b) \
|
||||
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_SAP, 0x15, -1) \
|
||||
X(IZAR, MANUFACTURER_SAP, 0x04, -1) \
|
||||
X(IZAR, MANUFACTURER_SAP, 0x07, 0x00) \
|
||||
X(IZAR, MANUFACTURER_DME, 0x07, 0x78) \
|
||||
X(IZAR3, MANUFACTURER_SAP, 0x00, 0x88) \
|
||||
X(LANSENSM, MANUFACTURER_LAS, 0x1a, 0x03) \
|
||||
X(LANSENTH, MANUFACTURER_LAS, 0x1b, 0x07) \
|
||||
X(LANSENDW, MANUFACTURER_LAS, 0x1d, 0x07) \
|
||||
X(LANSENPU, MANUFACTURER_LAS, 0x00, 0x14) \
|
||||
X(LANSENPU, MANUFACTURER_LAS, 0x00, 0x0b) \
|
||||
X(MKRADIO3, MANUFACTURER_TCH, 0x62, 0x74) \
|
||||
X(MKRADIO3, MANUFACTURER_TCH, 0x72, 0x74) \
|
||||
X(MKRADIO4, MANUFACTURER_TCH, 0x62, 0x95) \
|
||||
X(MKRADIO4, MANUFACTURER_TCH, 0x62, 0x70) \
|
||||
X(MKRADIO4, MANUFACTURER_TCH, 0x72, 0x95) \
|
||||
X(MKRADIO4, MANUFACTURER_TCH, 0x72, 0x70) \
|
||||
X(MULTICAL21, MANUFACTURER_KAM, 0x06, 0x1b) \
|
||||
X(MULTICAL21, MANUFACTURER_KAM, 0x16, 0x1b) \
|
||||
X(MULTICAL302,MANUFACTURER_KAM, 0x04, 0x30) \
|
||||
X(MULTICAL302,MANUFACTURER_KAM, 0x0d, 0x30) \
|
||||
X(MULTICAL403,MANUFACTURER_KAM, 0x0a, 0x34) \
|
||||
X(MULTICAL403,MANUFACTURER_KAM, 0x0b, 0x34) \
|
||||
X(MULTICAL403,MANUFACTURER_KAM, 0x0c, 0x34) \
|
||||
X(MULTICAL403,MANUFACTURER_KAM, 0x0d, 0x34) \
|
||||
X(MULTICAL603,MANUFACTURER_KAM, 0x04, 0x35) \
|
||||
X(MULTICAL803,MANUFACTURER_KAM, 0x04, 0x39) \
|
||||
X(OMNIPOWER, MANUFACTURER_KAM, 0x02, 0x30) \
|
||||
X(RFMAMB, MANUFACTURER_BMT, 0x1b, 0x10) \
|
||||
X(RFMTX1, MANUFACTURER_BMT, 0x07, 0x05) \
|
||||
X(TSD2, MANUFACTURER_TCH, 0xf0, 0x76) \
|
||||
X(Q400, MANUFACTURER_AXI, 0x07, 0x10) \
|
||||
X(QCALORIC, MANUFACTURER_QDS, 0x08, 0x35) \
|
||||
X(SHARKY, MANUFACTURER_HYD, 0x04, 0x20) \
|
||||
X(SUPERCOM587,MANUFACTURER_SON, 0x06, 0x3c) \
|
||||
X(SUPERCOM587,MANUFACTURER_SON, 0x07, 0x3c) \
|
||||
X(SONTEX868, MANUFACTURER_SON, 0x08, 0x16) \
|
||||
X(TOPASESKR, MANUFACTURER_AMT, 0x06, 0xf1) \
|
||||
X(TOPASESKR, MANUFACTURER_AMT, 0x07, 0xf1) \
|
||||
X(ULTRIMIS, MANUFACTURER_APA, 0x16, 0x01) \
|
||||
X(VARIO451, MANUFACTURER_TCH, 0x04, 0x27) \
|
||||
X(VARIO451, MANUFACTURER_TCH, 0xc3, 0x27) \
|
||||
X(WATERSTARM, MANUFACTURER_DWZ, 0x06, 0x02) \
|
||||
X(WATERSTARM, MANUFACTURER_DWZ, 0x07, 0x02) \
|
||||
X(WATERSTARM, MANUFACTURER_EFE, 0x07, 0x03) \
|
||||
X(WHE46X, MANUFACTURER_LSE, 0x08, 0x18) \
|
||||
X(WHE5X, MANUFACTURER_LSE, 0x08, 0x34) \
|
||||
X(SENSOSTAR, MANUFACTURER_EFE, 0x04, 0x00) \
|
||||
X(CCx01, MANUFACTURER_GSS, 0x02, 0x01) \
|
||||
X(LSE_08, MANUFACTURER_LSE, 0x08, 0x01) \
|
||||
X(WEH_07, MANUFACTURER_WEH, 0x07, 0xfe) \
|
||||
|
||||
|
||||
// End of list
|
||||
|
|
@ -17,6 +17,7 @@
|
|||
|
||||
#include"config.h"
|
||||
#include"meters.h"
|
||||
#include"meter_detection.h"
|
||||
#include"meters_common_implementation.h"
|
||||
#include"units.h"
|
||||
#include"wmbus.h"
|
||||
|
|
@ -82,6 +83,36 @@ public:
|
|||
return meters_.size() != 0 || meter_templates_.size() != 0;
|
||||
}
|
||||
|
||||
void warnForUnknownDriver(string name, Telegram *t)
|
||||
{
|
||||
int mfct = t->dll_mfct;
|
||||
int media = t->dll_type;
|
||||
int version = t->dll_version;
|
||||
uchar *id_b = t->dll_id_b;
|
||||
|
||||
if (t->tpl_id_found)
|
||||
{
|
||||
mfct = t->dll_mfct;
|
||||
media = t->dll_type;
|
||||
version = t->dll_version;
|
||||
id_b = t->tpl_id_b;
|
||||
}
|
||||
|
||||
warning("(meter) %s: meter detection could not find driver for "
|
||||
"id: %02x%02x%02x%02x mfct: (%s) %s (0x%02x) type: %s (0x%02x) ver: 0x%02x\n",
|
||||
name.c_str(),
|
||||
id_b[3], id_b[2], id_b[1], id_b[0],
|
||||
manufacturerFlag(mfct).c_str(),
|
||||
manufacturer(mfct).c_str(),
|
||||
mfct,
|
||||
mediaType(media, mfct).c_str(), media,
|
||||
version);
|
||||
|
||||
|
||||
warning("(meter) please consider opening an issue at https://github.com/weetmuts/wmbusmeters/\n");
|
||||
warning("(meter) to add support for this unknown mfct,media,version combination\n");
|
||||
}
|
||||
|
||||
bool handleTelegram(AboutTelegram &about, vector<uchar> input_frame, bool simulated)
|
||||
{
|
||||
if (!hasMeters())
|
||||
|
|
@ -138,6 +169,10 @@ public:
|
|||
{
|
||||
// Look up the proper meter driver!
|
||||
tmp.type = pickMeterDriver(&t);
|
||||
if (tmp.type == MeterType::UNKNOWN)
|
||||
{
|
||||
warnForUnknownDriver(mi.name, &t);
|
||||
}
|
||||
}
|
||||
// Now build a meter object with for this exact id.
|
||||
auto meter = createMeter(&tmp);
|
||||
|
|
|
|||
92
src/meters.h
92
src/meters.h
|
|
@ -88,98 +88,6 @@
|
|||
X(weh_07, C1_bit, WaterMeter, WEH_07, WEH_07) \
|
||||
|
||||
|
||||
// List of numbers that can be used to detect the meter driver from a telegram.
|
||||
//
|
||||
// meter driver, manufacturer, media, version
|
||||
//
|
||||
#define METER_DETECTION \
|
||||
X(AMIPLUS, MANUFACTURER_APA, 0x02, 0x02) \
|
||||
X(AMIPLUS, MANUFACTURER_DEV, 0x37, 0x02) \
|
||||
X(AMIPLUS, MANUFACTURER_DEV, 0x02, 0x00) \
|
||||
X(APATOR08, 0x8614/*APT?*/, 0x03, 0x03) \
|
||||
X(APATOR162, MANUFACTURER_APA, 0x06, 0x05) \
|
||||
X(APATOR162, MANUFACTURER_APA, 0x07, 0x05) \
|
||||
X(CMA12W, MANUFACTURER_ELV, 0x1b, 0x20) \
|
||||
X(COMPACT5, MANUFACTURER_TCH, 0x04, 0x45) \
|
||||
X(COMPACT5, MANUFACTURER_TCH, 0xc3, 0x45) \
|
||||
X(COMPACT5, MANUFACTURER_TCH, 0x43, 0x22) \
|
||||
X(COMPACT5, MANUFACTURER_TCH, 0x43, 0x45) \
|
||||
X(EBZWMBE, MANUFACTURER_EBZ, 0x37, 0x02) \
|
||||
X(EURISII, MANUFACTURER_INE, 0x08, 0x55) \
|
||||
X(EHZP, MANUFACTURER_EMH, 0x02, 0x02) \
|
||||
X(ESYSWM, MANUFACTURER_ESY, 0x37, 0x30) \
|
||||
X(FLOWIQ2200,MANUFACTURER_KAW, 0x16, 0x3a) \
|
||||
X(FLOWIQ3100,MANUFACTURER_KAM, 0x16, 0x1d) \
|
||||
X(ELF, MANUFACTURER_APA, 0x04, 0x40) \
|
||||
X(EM24, MANUFACTURER_KAM, 0x02, 0x33) \
|
||||
X(EMERLIN868,MANUFACTURER_ELR, 0x37, 0x11) \
|
||||
X(EV200, MANUFACTURER_ELR, 0x07, 0x0d) \
|
||||
X(EVO868, MANUFACTURER_MAD, 0x07, 0x50) \
|
||||
X(FHKVDATAIII,MANUFACTURER_TCH, 0x80, 0x69) \
|
||||
X(FHKVDATAIII,MANUFACTURER_TCH, 0x80, 0x94) \
|
||||
X(FHKVDATAIV,MANUFACTURER_TCH, 0x08, 0x69) \
|
||||
X(FHKVDATAIV,MANUFACTURER_TCH, 0x08, 0x94) \
|
||||
X(HYDRUS, MANUFACTURER_DME, 0x07, 0x70) \
|
||||
X(HYDRUS, MANUFACTURER_HYD, 0x07, 0x24) \
|
||||
X(HYDRUS, MANUFACTURER_DME, 0x06, 0x70) \
|
||||
X(HYDRUS, MANUFACTURER_DME, 0x16, 0x70) \
|
||||
X(HYDROCALM3,MANUFACTURER_BMT, 0x0d, 0x0b) \
|
||||
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_SAP, 0x15, -1) \
|
||||
X(IZAR, MANUFACTURER_SAP, 0x04, -1) \
|
||||
X(IZAR, MANUFACTURER_SAP, 0x07, 0x00) \
|
||||
X(IZAR, MANUFACTURER_DME, 0x07, 0x78) \
|
||||
X(IZAR3, MANUFACTURER_SAP, 0x00, 0x88) \
|
||||
X(LANSENSM, MANUFACTURER_LAS, 0x1a, 0x03) \
|
||||
X(LANSENTH, MANUFACTURER_LAS, 0x1b, 0x07) \
|
||||
X(LANSENDW, MANUFACTURER_LAS, 0x1d, 0x07) \
|
||||
X(LANSENPU, MANUFACTURER_LAS, 0x00, 0x14) \
|
||||
X(LANSENPU, MANUFACTURER_LAS, 0x00, 0x0b) \
|
||||
X(MKRADIO3, MANUFACTURER_TCH, 0x62, 0x74) \
|
||||
X(MKRADIO3, MANUFACTURER_TCH, 0x72, 0x74) \
|
||||
X(MKRADIO4, MANUFACTURER_TCH, 0x62, 0x95) \
|
||||
X(MKRADIO4, MANUFACTURER_TCH, 0x62, 0x70) \
|
||||
X(MKRADIO4, MANUFACTURER_TCH, 0x72, 0x95) \
|
||||
X(MKRADIO4, MANUFACTURER_TCH, 0x72, 0x70) \
|
||||
X(MULTICAL21, MANUFACTURER_KAM, 0x06, 0x1b) \
|
||||
X(MULTICAL21, MANUFACTURER_KAM, 0x16, 0x1b) \
|
||||
X(MULTICAL302,MANUFACTURER_KAM, 0x04, 0x30) \
|
||||
X(MULTICAL302,MANUFACTURER_KAM, 0x0d, 0x30) \
|
||||
X(MULTICAL403,MANUFACTURER_KAM, 0x0a, 0x34) \
|
||||
X(MULTICAL403,MANUFACTURER_KAM, 0x0b, 0x34) \
|
||||
X(MULTICAL403,MANUFACTURER_KAM, 0x0c, 0x34) \
|
||||
X(MULTICAL403,MANUFACTURER_KAM, 0x0d, 0x34) \
|
||||
X(MULTICAL603,MANUFACTURER_KAM, 0x04, 0x35) \
|
||||
X(MULTICAL803,MANUFACTURER_KAM, 0x04, 0x39) \
|
||||
X(OMNIPOWER, MANUFACTURER_KAM, 0x02, 0x30) \
|
||||
X(RFMAMB, MANUFACTURER_BMT, 0x1b, 0x10) \
|
||||
X(RFMTX1, MANUFACTURER_BMT, 0x07, 0x05) \
|
||||
X(TSD2, MANUFACTURER_TCH, 0xf0, 0x76) \
|
||||
X(Q400, MANUFACTURER_AXI, 0x07, 0x10) \
|
||||
X(QCALORIC, MANUFACTURER_QDS, 0x08, 0x35) \
|
||||
X(SHARKY, MANUFACTURER_HYD, 0x04, 0x20) \
|
||||
X(SUPERCOM587,MANUFACTURER_SON, 0x06, 0x3c) \
|
||||
X(SUPERCOM587,MANUFACTURER_SON, 0x07, 0x3c) \
|
||||
X(SONTEX868, MANUFACTURER_SON, 0x08, 0x16) \
|
||||
X(TOPASESKR, MANUFACTURER_AMT, 0x06, 0xf1) \
|
||||
X(TOPASESKR, MANUFACTURER_AMT, 0x07, 0xf1) \
|
||||
X(ULTRIMIS, MANUFACTURER_APA, 0x16, 0x01) \
|
||||
X(VARIO451, MANUFACTURER_TCH, 0x04, 0x27) \
|
||||
X(VARIO451, MANUFACTURER_TCH, 0xc3, 0x27) \
|
||||
X(WATERSTARM, MANUFACTURER_DWZ, 0x06, 0x02) \
|
||||
X(WATERSTARM, MANUFACTURER_DWZ, 0x07, 0x02) \
|
||||
X(WATERSTARM, MANUFACTURER_EFE, 0x07, 0x03) \
|
||||
X(WHE46X, MANUFACTURER_LSE, 0x08, 0x18) \
|
||||
X(WHE5X, MANUFACTURER_LSE, 0x08, 0x34) \
|
||||
X(SENSOSTAR, MANUFACTURER_EFE, 0x04, 0x00) \
|
||||
X(CCx01, MANUFACTURER_GSS, 0x02, 0x01) \
|
||||
X(LSE_08, MANUFACTURER_LSE, 0x08, 0x01) \
|
||||
X(WEH_07, MANUFACTURER_WEH, 0x07, 0xfe) \
|
||||
|
||||
enum class MeterType {
|
||||
#define X(mname,linkmode,info,type,cname) type,
|
||||
LIST_OF_METERS
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue