kopia lustrzana https://github.com/weetmuts/wmbusmeters
Update README/CHANGES about new auto driver.
rodzic
4169574f4a
commit
a74c36da15
9
CHANGES
9
CHANGES
|
@ -1,3 +1,12 @@
|
||||||
|
|
||||||
|
You can now use "auto" as a meter driver.
|
||||||
|
Wmbusmeters will then pick the right driver when
|
||||||
|
the first telegram arrives. A warning will be printed
|
||||||
|
in the logs if no driver could be found.
|
||||||
|
|
||||||
|
If you do not specify a type= in the meter config file,
|
||||||
|
then it will default to auto.
|
||||||
|
|
||||||
Version 1.2.0: 2021-03-07
|
Version 1.2.0: 2021-03-07
|
||||||
|
|
||||||
IMPORTANT CHANGES THAT MIGHT AFFECT YOU!vvvvvvvvvvvvvvvvvvvvvv
|
IMPORTANT CHANGES THAT MIGHT AFFECT YOU!vvvvvvvvvvvvvvvvvvvvvv
|
||||||
|
|
|
@ -82,11 +82,14 @@ ignoreduplicates=true
|
||||||
Then add a meter file in /etc/wmbusmeters.d/MyTapWater
|
Then add a meter file in /etc/wmbusmeters.d/MyTapWater
|
||||||
```
|
```
|
||||||
name=MyTapWater
|
name=MyTapWater
|
||||||
type=multical21:c1
|
|
||||||
id=12345678
|
id=12345678
|
||||||
key=00112233445566778899AABBCCDDEEFF
|
key=00112233445566778899AABBCCDDEEFF
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Meter driver detection will be automatic. You can also provide an
|
||||||
|
explicit driver name with: `type=multical21:c1` or explicitly state
|
||||||
|
that driver detection is automatic: `type=auto`.
|
||||||
|
|
||||||
Now plugin your wmbus dongle. Wmbusmeters should start automatically,
|
Now plugin your wmbus dongle. Wmbusmeters should start automatically,
|
||||||
check with `tail -f /var/log/syslog` and `tail -f /var/log/wmbusmeters/wmbusmeters.log`
|
check with `tail -f /var/log/syslog` and `tail -f /var/log/wmbusmeters/wmbusmeters.log`
|
||||||
(If you are using an rtlsdr dongle, then make sure that either the binaries /usr/bin/rtl_sdr and
|
(If you are using an rtlsdr dongle, then make sure that either the binaries /usr/bin/rtl_sdr and
|
||||||
|
@ -350,10 +353,10 @@ Received telegram from: 12345678
|
||||||
driver: multical21
|
driver: multical21
|
||||||
```
|
```
|
||||||
|
|
||||||
Now listen to this specific meter.
|
Now listen to this specific meter, since the driver is auto-detected, we can use `auto` for the meter driver.
|
||||||
|
|
||||||
```
|
```
|
||||||
wmbusmeters auto:c1 MyTapWater multical21:c1 12345678 00112233445566778899AABBCCDDEEFF
|
wmbusmeters auto:c1 MyTapWater auto 12345678 00112233445566778899AABBCCDDEEFF
|
||||||
```
|
```
|
||||||
|
|
||||||
(The Multical21 and other meters use compressed telegrams, which means
|
(The Multical21 and other meters use compressed telegrams, which means
|
||||||
|
|
|
@ -51,9 +51,9 @@ void parseMeterConfig(Configuration *c, vector<char> &buf, string file)
|
||||||
auto i = buf.begin();
|
auto i = buf.begin();
|
||||||
string bus;
|
string bus;
|
||||||
string name;
|
string name;
|
||||||
string type;
|
string type = "auto";
|
||||||
string id;
|
string id;
|
||||||
string key;
|
string key = "";
|
||||||
string linkmodes;
|
string linkmodes;
|
||||||
int bps {};
|
int bps {};
|
||||||
vector<string> telegram_shells;
|
vector<string> telegram_shells;
|
||||||
|
|
|
@ -92,9 +92,9 @@ public:
|
||||||
|
|
||||||
if (t->tpl_id_found)
|
if (t->tpl_id_found)
|
||||||
{
|
{
|
||||||
mfct = t->dll_mfct;
|
mfct = t->tpl_mfct;
|
||||||
media = t->dll_type;
|
media = t->tpl_type;
|
||||||
version = t->dll_version;
|
version = t->tpl_version;
|
||||||
id_b = t->tpl_id_b;
|
id_b = t->tpl_id_b;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -933,9 +933,9 @@ MeterType pickMeterDriver(Telegram *t)
|
||||||
|
|
||||||
if (t->tpl_id_found)
|
if (t->tpl_id_found)
|
||||||
{
|
{
|
||||||
manufacturer = t->dll_mfct;
|
manufacturer = t->tpl_mfct;
|
||||||
media = t->dll_type;
|
media = t->tpl_type;
|
||||||
version = t->dll_version;
|
version = t->tpl_version;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define X(TY,MA,ME,VE) { if (manufacturer == MA && (media == ME || ME == -1) && (version == VE || VE == -1)) { return MeterType::TY; }}
|
#define X(TY,MA,ME,VE) { if (manufacturer == MA && (media == ME || ME == -1) && (version == VE || VE == -1)) { return MeterType::TY; }}
|
||||||
|
|
|
@ -1,4 +1,2 @@
|
||||||
id=52525252
|
id=52525252
|
||||||
type=flowiq2200
|
|
||||||
name=MyWater
|
name=MyWater
|
||||||
key=
|
|
|
@ -1,4 +1,4 @@
|
||||||
id=86868686
|
id=86868686
|
||||||
type=weh_07
|
type=auto
|
||||||
name=Vatten
|
name=Vatten
|
||||||
key=
|
key=
|
Ładowanie…
Reference in New Issue