mirror
/
wmbusmeters
kopia lustrzana https://github.com/weetmuts/wmbusmeters
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność
707 Commity
3 Gałęzie
71 Tagi
7,7 MiB
Wykres commitów

401 Commity (e73008ff6512af10206378060dd0d78bd7050ce2)

Autor SHA1 Wiadomość Data
Fredrik Öhrström e73008ff65 Added another weird izar mfct,type,ver combo. 2020-11-11 17:29:20 +01:00
Fredrik Öhrström 85786cbe8c Fix bug that caused auto even though only a single device expected, like: rtlwmbus[1234] 2020-11-11 17:08:24 +01:00
Patrick Schwarz c71a95b815 Add Engelmann Sensostar2 to heat meters and recognize Engelmann FAW water meter radio module as waterstar beause it seems to be the same protocol 2020-11-10 14:20:04 +01:00
Fredrik Öhrström eae65a1961 Handle missing battery data in hydrus meter. 2020-11-08 23:43:12 +01:00
Fredrik Öhrström a33a9fb129 Added test for ultrimis. 2020-11-03 18:15:51 +01:00
Fredrik Öhrström b8e9eb2431 Merge jacek27 contribution of Ultrimis water meter. 2020-11-03 05:23:48 +01:00
Fredrik Öhrström 966487fcb8 Fix bug where <device>:c1 did not pick the right linkmode. 2020-11-01 21:49:57 +01:00
Fredrik Öhrström d297636b09 Fix bug that prevented rtlwmbus to be detected. 2020-11-01 21:25:23 +01:00
Fredrik Öhrström 5e273ddb7e Added donotprobe=<device> and fixed so that it does not probe if a device is specified or rtlwmbus is specified. 2020-11-01 15:18:13 +01:00
Fredrik Öhrström 171887e2f9 Fix bug where the rc1180 code detected anything as a rc1180 dongle. 2020-11-01 09:34:18 +01:00
Damian Wrobel 87964d4d02 Fix abort in detectRC1180 
Fixes the following crash:

 Thread 1 "wmbusmeters" received signal SIGABRT, Aborted.
 [Switching to Thread 0x7ffff7a16e00 (LWP 33345)]
 0x00007ffff7a9d9e5 in raise () from /lib64/libc.so.6
 (gdb) bt
 #0  0x00007ffff7a9d9e5 in raise () from /lib64/libc.so.6
 #1  0x00007ffff7a86895 in abort () from /lib64/libc.so.6
 #2  0x00005555555962cc in std::__replacement_assert (__file=0x5555556af910 "/usr/include/c++/10/bits/stl_vector.h", __line=1045,
     __function=0x5555556af7f0 "std::vector<_Tp, _Alloc>::reference std::vector<_Tp, _Alloc>::operator[](std::vector<_Tp, _Alloc>::size_type) [with _Tp = unsigned char; _Alloc = std::allocator<unsigned char>; std::vector<_Tp, _Alloc"...,
     __condition=0x5555556af7c0 "__builtin_expect(__n < this->size(), true)") at /usr/include/c++/10/x86_64-redhat-linux/bits/c++config.h:2560
 #3  0x000055555559dbe5 in std::vector<unsigned char, std::allocator<unsigned char> >::operator[] (this=0x7fffffffd9e0, __n=0) at /usr/include/c++/10/bits/stl_vector.h:1045
 #4  0x000055555569191f in detectRC1180 (detected=0x7fffffffdba0, manager=std::shared_ptr<SerialCommunicationManager> (use count 3, weak count 0) = {...}) at src/wmbus_rc1180.cc:344
 #5  0x0000555555674e7c in detectWMBusDeviceOnTTY (tty="/dev/ttyS0", handler=std::shared_ptr<SerialCommunicationManager> (use count 3, weak count 0) = {...}) at src/wmbus.cc:4201
 #6  0x00005555556a1d3c in perform_auto_scan_of_serial_devices (config=0x555555769790) at src/main.cc:870
 #7  0x00005555556a1b11 in perform_auto_scan_of_devices (config=0x555555769790) at src/main.cc:845
 #8  0x00005555556997d3 in detect_and_configure_wmbus_devices (config=0x555555769790) at src/main.cc:557
 #9  0x00005555556a322a in start (config=0x555555769790) at src/main.cc:1104
 #10 0x0000555555694796 in main (argc=3, argv=0x7fffffffe228) at src/main.cc:192
 (gdb) fr 4
 #4  0x000055555569191f in detectRC1180 (detected=0x7fffffffdba0, manager=std::shared_ptr<SerialCommunicationManager> (use count 3, weak count 0) = {...}) at src/wmbus_rc1180.cc:344
 344	    if (data[0] != '>')
 (gdb) p data
 $1 = std::vector of length 0, capacity 1024

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2020-10-31 19:44:30 +01:00
Fredrik Öhrström 3bd42bbc70 Added sontex868 heat cost allocator. 2020-10-31 15:16:14 +01:00
Fredrik Öhrström f633172597 Add new identification of amiplus compatible meter. 2020-10-26 16:48:30 +01:00
Fredrik Öhrström 71dc60678b Improve detection. 2020-10-26 16:32:28 +01:00
Fredrik Öhrström 64a2d7f8c3 Fix bug that caused stdin:rtlwmubs to fail. 2020-10-26 15:54:55 +01:00
Fredrik Öhrström 7ff4690539 Fix bug that prevented explicit tty:device:c1 to work. 2020-10-26 15:30:43 +01:00
Fredrik Öhrström f995f72239 Adjust cul driver. 2020-10-26 15:14:13 +01:00
Fredrik Öhrström f4ad901cee Remove wmbus dongles for which I have no documentation. 2020-10-25 21:43:32 +01:00
Fredrik Öhrström ea530a7531 Added --ignoreduplicates 2020-10-25 20:57:25 +01:00
Fredrik Öhrström 379d48ce78 Add missing source file. 2020-10-25 19:52:12 +01:00
Fredrik Öhrström 097301c8b4 Add support for flowiq2200 meter. 2020-10-25 19:48:07 +01:00
Fredrik Öhrström 4cbf1a4b27 Decode two vendor values in multical603 as energy forward and returned. 2020-10-25 18:54:03 +01:00
Fredrik Öhrström 88d655e66a Accept t1 and c1 as linkmodes for multical21 meters. 2020-10-25 18:26:21 +01:00
Fredrik Öhrström 728bf66752 Add unique device id in addition to normal device id. 2020-10-25 15:28:52 +01:00
Fredrik Öhrström 40def6491b Added wmbus_common_implementation.h 2020-10-25 08:21:26 +01:00
Fredrik Öhrström c16409c28a List fields improvement. 2020-10-24 22:20:55 +02:00
Fredrik Öhrström 203e90bb7c Update man page. 2020-10-24 21:59:16 +02:00
Fredrik Öhrström 23f9a92605 Include mach.h for macosx. 2020-10-24 18:38:44 +02:00
Fredrik Öhrström 3407bcfc3d Remove dependency on libusb. 2020-10-24 17:14:39 +02:00
Fredrik Öhrström 5e938202c8 Update rc1180 code. 2020-10-24 16:16:50 +02:00
Fredrik Öhrström 9904ae9391 Update CHANGES. 2020-10-21 16:21:32 +02:00
Fredrik Öhrström c4226a8268 Added device and rssi_dbm to json. 2020-10-14 20:59:14 +02:00
Fredrik Öhrström db6b1b5c93 Timer loop every 1 s. 2020-10-14 17:02:51 +02:00
Fredrik Öhrström f7fd3fef18 Proper support for using the rtlsdr dongle serial. 2020-10-12 20:34:15 +02:00
Fredrik Öhrström 4c18893fd7 Alarm for specified device not found, is now working. 2020-10-12 06:55:48 +02:00
Fredrik Öhrström 291a9be8e5 The word device is reserved for wmbus dongles. 2020-10-11 11:01:10 +02:00
Fredrik Öhrström 0c2eb722d1 Now auto detects any number rtlwmbus devices. 2020-10-07 21:40:33 +02:00
Fredrik Öhrström d8e7be70c4 A single rtlwmbus now works. 2020-10-05 19:47:58 +02:00
Fredrik Öhrström 8cc2123df0 Improved logic for configuring wmbus devices. Many changes. 2020-10-04 22:52:05 +02:00
Fredrik Öhrström f777f71d51 Add missing source files. 2020-09-27 19:55:39 +02:00
Fredrik Öhrström f5ff15af2c Use librtlsdr to detect rtl-sdr dongle. 2020-09-27 19:40:05 +02:00
Fredrik Öhrström 3552282e8f Added tracing of semaphore. 2020-09-27 12:05:08 +02:00
Fredrik Öhrström 69af4f462f Add errno.h for macosx build. 2020-09-27 11:44:24 +02:00
Fredrik Öhrström ef59dad7cd Replaced sem_post/sem_wait with pthread_cond_signal_timedwait 2020-09-27 11:35:57 +02:00
Fredrik Öhrström cddfaecebb Standardize the remaining battery life to years. 2020-09-27 11:17:21 +02:00
Fredrik Öhrström 701c6041ac Added support for new version of Hydrus meter. 2020-09-27 11:01:36 +02:00
Fredrik Öhrström d443fd4ea2 Add partial support for RC1180. 2020-09-26 13:52:24 +02:00
Fredrik Öhrström e4f9eb23db Extract multical603 total kwh properly. 2020-09-26 09:14:26 +02:00
Fredrik Öhrström 08362c7571
Merge pull request #168 from elbaek89/master 
Multical 603 support (work in progress)
 2020-09-26 08:45:47 +02:00
Fredrik Öhrström eb89c7b31d Moved waitForResponse into common implementation. 2020-09-26 00:10:34 +02:00