Merge remote-tracking branch 'origin/master' into fb_add_itron_ultramaxx

Add another m,v,t combo for the lse_07_17 driver.
Merge pull request #1245 from majonezz/patch-1
2024-04-26 19:47:53 +02:00 · 2024-04-15 08:44:14 +02:00 · 2024-04-14 16:13:26 +02:00 · 2024-04-14 15:16:56 +02:00
--- a/src/driver_lse_07_17.cc
+++ b/src/driver_lse_07_17.cc
@ -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
--- a/src/wmbus_cul.cc
+++ b/src/wmbus_cul.cc
@ -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;
Autor	SHA1	Wiadomość	Data
Andreas Horrer	d839a7d37d	Merge remote-tracking branch 'origin/master' into fb_add_itron_ultramaxx	2024-04-26 19:47:53 +02:00
Fredrik Öhrström	d90dbb196e	Add another m,v,t combo for the lse_07_17 driver.	2024-04-15 08:44:14 +02:00
Fredrik Öhrström	14d021426a	Merge pull request #1245 from majonezz/patch-1 Avoid SIGSEGV in WMBusCUL::checkCULFrame	2024-04-14 16:13:26 +02:00
Michał Morański	f32179a939	Avoid SIGSEGV in WMBusCUL::checkCULFrame (cul) checkCULFrame "b2F4468506586269295620A17A2069F2" (cul) no eol found yet, partial frame (serial) received ascii "TMODE<0D><0A>b2F44685086625092957245C6A2069F2F6A06E0080000000000000000B9BF00000D0F0D11130512100F0F0F100F0F8E1F0F0E0D121310B241<0D><0A>b4E44B61065960200023732117A0E004005E4B5FD2A1E3DCCC84F38BDF21FD05D506BF685D50CB3AD9644F9FF7C893BF9DD0D2B64C85F703707B1965C69261E8CDF85046CDDC38F1336D67750E933854BA0C9A91240A18556E6064B<0D><0A>" (cul) checkCULFrame "b2F4468506586269295620A17A2069F2TMODE<0D><0A>b2F44685086625092957245C6A2069F2F6A06E0080000000000000000B9BF00000D0F0D11130512100F0F0F100F0F8E1F0F0E0D121310B241<0D><0A>b4E44B61065960200023732117A0E004005E4B5FD2A1E3DCCC84F38BDF21FD05D506BF685D50CB3AD9644F9FF7C893BF9DD0D2B64C85F703707B1965C69261E8CDF85046CDDC38F1336D67750E933854BA0C9A91240A18556E6064B<0D><0A>" (cul) bad hex for LQI and RSSI "MODE" (cul) warning: the LQI and RSSI hex string is not properly formatted! Thread 2 "wmbusmeters" received signal SIGSEGV, Segmentation fault. 0x571c718f in WMBusCUL::checkCULFrame (this=0xf0a03480, data=std::vector of length 339, capacity 339 = {...}, hex_frame_length=0xf07fe680, payload=std::vector of length 0, capacity 0, rssi_dbm=0xf07fe6c0) at src/wmbus_cul.cc:336 336 uint lqi = lqi_rssi[0]>>1; (gdb)	2024-04-14 15:16:56 +02:00