kopia lustrzana https://github.com/weetmuts/wmbusmeters
Porównaj commity
4 Commity
efcc41d107
...
d90dbb196e
Autor | SHA1 | Data |
---|---|---|
Fredrik Öhrström | d90dbb196e | |
Fredrik Öhrström | 14d021426a | |
Michał Morański | f32179a939 | |
Fredrik Öhrström | a32fcfdf9a |
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
Copyright (C) 2021-2022 Fredrik Öhrström (gpl-3.0-or-later)
|
||||
Copyright (C) 2021-2024 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
|
||||
|
@ -34,6 +34,7 @@ namespace
|
|||
di.addDetection(MANUFACTURER_LSE, 0x07, 0x18);
|
||||
di.addDetection(MANUFACTURER_LSE, 0x07, 0x16);
|
||||
di.addDetection(MANUFACTURER_LSE, 0x07, 0x17);
|
||||
di.addDetection(MANUFACTURER_LSE, 0x07, 0xd8);
|
||||
di.setConstructor([](MeterInfo& mi, DriverInfo& di){ return shared_ptr<Meter>(new Driver(mi, di)); });
|
||||
});
|
||||
|
||||
|
@ -207,3 +208,8 @@ namespace
|
|||
// telegram=|2D4465329933961318067ADA000000_0C13567100004C1300000000426CFFFF02BB560000326CFFFF046D2307A12C|
|
||||
// {"media":"warm water","meter":"lse_07_17","name":"Water","id":"13963399","total_m3":7.156,"due_date_m3":0,"due_date":"2127-15-31","what_date_m3":7,"what_date":"2021-11-30","error_code":"OK","error_date":"2127-15-31","device_date_time":"2021-12-01 07:35","meter_version":"11","timestamp":"1111-11-11T11:11:11Z"}
|
||||
// |Water;13963399;7.156;0;2127-15-31;OK;2127-15-31;2021-12-01 07:35;1111-11-11 11:11.11
|
||||
|
||||
// Test: Water2 lse_07_17 09993623 NOKEY
|
||||
// telegram=|2d44653223369909d8077a80000000046d130aed2B0c13233332004c1351762700426cdf2c326cffff02BB560000|
|
||||
// {"device_date_time": "2023-11-13 10:19","due_date": "2022-12-31","due_date_m3": 277.651,"error_code": "OK","error_date": "2127-15-31","id": "09993623","media": "water","meter": "lse_07_17","name": "Water2","timestamp": "1111-11-11T11:11:11Z","total_m3": 323.323}
|
||||
// |Water2;09993623;323.323;277.651;2022-12-31;OK;2127-15-31;2023-11-13 10:19;1111-11-11 11:11.11
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
Copyright (C) 2017-2023 Fredrik Öhrström (gpl-3.0-or-later)
|
||||
Copyright (C) 2017-2024 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
|
||||
|
|
|
@ -331,6 +331,7 @@ FrameStatus WMBusCUL::checkCULFrame(vector<uchar> &data,
|
|||
string s = safeString(hex_buffer);
|
||||
debug("(cul) bad hex for LQI and RSSI \"%s\"\n", s.c_str());
|
||||
warning("(cul) warning: the LQI and RSSI hex string is not properly formatted!\n");
|
||||
return ErrorInFrame;
|
||||
}
|
||||
// LQI is 7 bits unsigned number and relative - range 0-127 lower is better
|
||||
uint lqi = lqi_rssi[0]>>1;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
Copyright (C) 2018-2020 Fredrik Öhrström (gpl-3.0-or-later)
|
||||
Copyright (C) 2018-2024 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
|
||||
|
@ -39,7 +39,10 @@ bool decrypt_ELL_AES_CTR(Telegram *t, vector<uchar> &frame, vector<uchar>::itera
|
|||
// A-field
|
||||
for (int j=0; j<6; ++j) { iv[i++] = t->dll_a[j]; }
|
||||
// CC-field
|
||||
iv[i++] = t->ell_cc;
|
||||
// Two bits should be zeroed out:
|
||||
// 0x10 H-field Hop-count set when telegram is repeated
|
||||
// 0x02 R-field Repeated access field
|
||||
iv[i++] = t->ell_cc & ~(0x10) & ~(0x02);
|
||||
// SN-field
|
||||
for (int j=0; j<4; ++j) { iv[i++] = t->ell_sn_b[j]; }
|
||||
// FN
|
||||
|
|
|
@ -447,6 +447,7 @@ ActualityDuration
|
|||
FabricationNo
|
||||
EnhancedIdentification
|
||||
EnergyMWh
|
||||
EnergyGJ
|
||||
RelativeHumidity
|
||||
AccessNumber
|
||||
Medium
|
||||
|
|
Ładowanie…
Reference in New Issue