mirror
/
wmbusmeters
kopia lustrzana https://github.com/weetmuts/wmbusmeters
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #971 from stigger/qds_walkby 

QDS walk-by: check length before attempting to parse the proprietary …
pull/991/head
Fredrik Öhrström 2023-06-28 12:06:31 +02:00 zatwierdzone przez GitHub
rodzic 876b5ce0af 13d18ef711
commit 1611f12753
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 10 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
src/driver_qheat.cc
Wyświetl plik

@ -191,11 +191,13 @@ namespace
it = t->dv_entries.find("0DFF5F");
if (it != t->dv_entries.end()) {
DVEntry entry = it->second.second;
qdsExtractWalkByField(t, this, entry, 24, 8, "0C05", "total_energy_consumption", Quantity::Energy);
qdsExtractWalkByField(t, this, entry, 32, 4, "426C", "last_year_date", Quantity::Text);
qdsExtractWalkByField(t, this, entry, 36, 8, "4C05", "last_year_energy_consumption", Quantity::Energy);
qdsExtractWalkByField(t, this, entry, 44, 4, "C2086C", "last_month_date", Quantity::Text);
qdsExtractWalkByField(t, this, entry, 48, 8, "CC0805", "last_month_energy_consumption", Quantity::Energy);
if (entry.value.length() == 53 * 2) {
qdsExtractWalkByField(t, this, entry, 24, 8, "0C05", "total_energy_consumption", Quantity::Energy);
qdsExtractWalkByField(t, this, entry, 32, 4, "426C", "last_year_date", Quantity::Text);
qdsExtractWalkByField(t, this, entry, 36, 8, "4C05", "last_year_energy_consumption", Quantity::Energy);
qdsExtractWalkByField(t, this, entry, 44, 4, "C2086C", "last_month_date", Quantity::Text);
qdsExtractWalkByField(t, this, entry, 48, 8, "CC0805", "last_month_energy_consumption", Quantity::Energy);
}
}
}
}

3
src/driver_qwater.cc
Wyświetl plik

@ -142,6 +142,9 @@ void Driver::processContent(Telegram *t) {
return;
}
DVEntry entry = it->second.second;
if (entry.value.length() != 53 * 2) {
return;
}
qdsExtractWalkByField(t, this, entry, 24, 8, "0C13", "total", Quantity::Volume);
qdsExtractWalkByField(t, this, entry, 32, 4, "426C", "due", Quantity::PointInTime);
qdsExtractWalkByField(t, this, entry, 36, 8, "4C13", "due_date", Quantity::Volume);