kopia lustrzana https://github.com/weetmuts/wmbusmeters
fix typo
rodzic
d6c83f65b2
commit
058b7bd3c5
|
@ -29,7 +29,7 @@ If you now start wmbusmeters with `wmbusmeters --debug --verbose useconfig=/` an
|
||||||
|
|
||||||
```
|
```
|
||||||
[2021-07-05_21:07:30] (meter) ABOGGLKZ: meter detection did not match the selected driver eurisii! correct driver is: unknown!
|
[2021-07-05_21:07:30] (meter) ABOGGLKZ: meter detection did not match the selected driver eurisii! correct driver is: unknown!
|
||||||
(meter) Not printing this warning agin for id: 60900126 mfct: (AAA) Aventies, Germany (0x421) type: Heat Cost Allocator (0x08) ver: 0x55
|
(meter) Not printing this warning again for id: 60900126 mfct: (AAA) Aventies, Germany (0x421) type: Heat Cost Allocator (0x08) ver: 0x55
|
||||||
[2021-07-05_21:07:30] (meter) please consider opening an issue at https://github.com/weetmuts/wmbusmeters/
|
[2021-07-05_21:07:30] (meter) please consider opening an issue at https://github.com/weetmuts/wmbusmeters/
|
||||||
[2021-07-05_21:07:30] (meter) to add support for this unknown mfct,media,version combination
|
[2021-07-05_21:07:30] (meter) to add support for this unknown mfct,media,version combination
|
||||||
(meter) ABOGGLKZ: yes for me
|
(meter) ABOGGLKZ: yes for me
|
||||||
|
@ -140,7 +140,7 @@ telegram=|76442104260190605508722601906021045508060060052F2F|0B6E660100426EA6008
|
||||||
Now keep especially the following lines in mind for integation into the meter definitions:
|
Now keep especially the following lines in mind for integation into the meter definitions:
|
||||||
```
|
```
|
||||||
[2021-07-05_21:07:30] (meter) ABOGGLKZ: meter detection did not match the selected driver eurisii! correct driver is: unknown!
|
[2021-07-05_21:07:30] (meter) ABOGGLKZ: meter detection did not match the selected driver eurisii! correct driver is: unknown!
|
||||||
(meter) Not printing this warning agin for id: 60900126 mfct: (AAA) Aventies, Germany (0x421) type: Heat Cost Allocator (0x08) ver: 0x55
|
(meter) Not printing this warning again for id: 60900126 mfct: (AAA) Aventies, Germany (0x421) type: Heat Cost Allocator (0x08) ver: 0x55
|
||||||
```
|
```
|
||||||
|
|
||||||
## Creating your class
|
## Creating your class
|
||||||
|
|
|
@ -513,7 +513,7 @@ bool MeterCommonImplementation::isTelegramForMeter(Telegram *t, Meter *meter, Me
|
||||||
{
|
{
|
||||||
string possible_drivers = t->autoDetectPossibleDrivers();
|
string possible_drivers = t->autoDetectPossibleDrivers();
|
||||||
warning("(meter) %s: meter detection did not match the selected driver %s! correct driver is: %s\n"
|
warning("(meter) %s: meter detection did not match the selected driver %s! correct driver is: %s\n"
|
||||||
"(meter) Not printing this warning agin for id: %02x%02x%02x%02x mfct: (%s) %s (0x%02x) type: %s (0x%02x) ver: 0x%02x\n",
|
"(meter) Not printing this warning again for id: %02x%02x%02x%02x mfct: (%s) %s (0x%02x) type: %s (0x%02x) ver: 0x%02x\n",
|
||||||
name.c_str(),
|
name.c_str(),
|
||||||
toString(driver).c_str(),
|
toString(driver).c_str(),
|
||||||
possible_drivers.c_str(),
|
possible_drivers.c_str(),
|
||||||
|
|
|
@ -12,7 +12,7 @@ $PROG --format=json simulations/simulation_bad_keys.txt room fhkvdataiii 0306571
|
||||||
|
|
||||||
cat > $TEST/expected_err.txt <<EOF
|
cat > $TEST/expected_err.txt <<EOF
|
||||||
(meter) room: meter detection did not match the selected driver fhkvdataiii! correct driver is: fhkvdataiv
|
(meter) room: meter detection did not match the selected driver fhkvdataiii! correct driver is: fhkvdataiv
|
||||||
(meter) Not printing this warning agin for id: 03065716 mfct: (TCH) Techem Service (0x5068) type: Heat Cost Allocator (0x08) ver: 0x94
|
(meter) Not printing this warning again for id: 03065716 mfct: (TCH) Techem Service (0x5068) type: Heat Cost Allocator (0x08) ver: 0x94
|
||||||
(wmbus) decrypted content failed check, did you use the correct decryption key? Permanently ignoring telegrams from id: 03065716 mfct: (TCH) Techem Service (0x5068) type: Heat Cost Allocator (0x08) ver: 0x94
|
(wmbus) decrypted content failed check, did you use the correct decryption key? Permanently ignoring telegrams from id: 03065716 mfct: (TCH) Techem Service (0x5068) type: Heat Cost Allocator (0x08) ver: 0x94
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ $PROG --format=json simulations/simulation_bad_keys.txt room fhkvdataiv 03065716
|
||||||
|
|
||||||
cat > $TEST/expected_err.txt <<EOF
|
cat > $TEST/expected_err.txt <<EOF
|
||||||
(meter) room: meter detection did not match the selected driver fhkvdataiv! correct driver is: fhkvdataiii
|
(meter) room: meter detection did not match the selected driver fhkvdataiv! correct driver is: fhkvdataiii
|
||||||
(meter) Not printing this warning agin for id: 03065716 mfct: (TCH) Techem Service (0x5068) type: Heat Cost Allocator (0x80) ver: 0x94
|
(meter) Not printing this warning again for id: 03065716 mfct: (TCH) Techem Service (0x5068) type: Heat Cost Allocator (0x80) ver: 0x94
|
||||||
(wmbus) decrypted content failed check, did you use the correct decryption key? Permanently ignoring telegrams from id: 03065716 mfct: (TCH) Techem Service (0x5068) type: Heat Cost Allocator (0x08) ver: 0x94
|
(wmbus) decrypted content failed check, did you use the correct decryption key? Permanently ignoring telegrams from id: 03065716 mfct: (TCH) Techem Service (0x5068) type: Heat Cost Allocator (0x08) ver: 0x94
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
|
@ -14,12 +14,12 @@ Forren lansensm 00010206 NOKEY
|
||||||
|
|
||||||
cat > $TEST/test_expected.txt <<EOF
|
cat > $TEST/test_expected.txt <<EOF
|
||||||
(meter) Dorren: meter detection did not match the selected driver lansendw! correct driver is: unknown!
|
(meter) Dorren: meter detection did not match the selected driver lansendw! correct driver is: unknown!
|
||||||
(meter) Not printing this warning agin for id: 00010205 mfct: (LAS) Lansen Systems, Sweden (0x3033) type: Unknown (0xff) ver: 0x07
|
(meter) Not printing this warning again for id: 00010205 mfct: (LAS) Lansen Systems, Sweden (0x3033) type: Unknown (0xff) ver: 0x07
|
||||||
(meter) please consider opening an issue at https://github.com/weetmuts/wmbusmeters/
|
(meter) please consider opening an issue at https://github.com/weetmuts/wmbusmeters/
|
||||||
(meter) to add support for this unknown mfct,media,version combination
|
(meter) to add support for this unknown mfct,media,version combination
|
||||||
{"media":"Unknown","meter":"lansendw","name":"Dorren","id":"00010205","status":"OPEN","timestamp":"1111-11-11T11:11:11Z"}
|
{"media":"Unknown","meter":"lansendw","name":"Dorren","id":"00010205","status":"OPEN","timestamp":"1111-11-11T11:11:11Z"}
|
||||||
(meter) Forren: meter detection did not match the selected driver lansensm! correct driver is: lansendw
|
(meter) Forren: meter detection did not match the selected driver lansensm! correct driver is: lansendw
|
||||||
(meter) Not printing this warning agin for id: 00010206 mfct: (LAS) Lansen Systems, Sweden (0x3033) type: Reserved for sensors (0x1d) ver: 0x07
|
(meter) Not printing this warning again for id: 00010206 mfct: (LAS) Lansen Systems, Sweden (0x3033) type: Reserved for sensors (0x1d) ver: 0x07
|
||||||
{"media":"reserved","meter":"lansensm","name":"Forren","id":"00010206","status":"OK","timestamp":"1111-11-11T11:11:11Z"}
|
{"media":"reserved","meter":"lansensm","name":"Forren","id":"00010206","status":"OK","timestamp":"1111-11-11T11:11:11Z"}
|
||||||
{"media":"Unknown","meter":"lansendw","name":"Dorren","id":"00010205","status":"OPEN","timestamp":"1111-11-11T11:11:11Z"}
|
{"media":"Unknown","meter":"lansendw","name":"Dorren","id":"00010205","status":"OPEN","timestamp":"1111-11-11T11:11:11Z"}
|
||||||
{"media":"reserved","meter":"lansensm","name":"Forren","id":"00010206","status":"OK","timestamp":"1111-11-11T11:11:11Z"}
|
{"media":"reserved","meter":"lansensm","name":"Forren","id":"00010206","status":"OK","timestamp":"1111-11-11T11:11:11Z"}
|
||||||
|
|
Ładowanie…
Reference in New Issue