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

666 Commity (0296eee88184647cc0da0d3cc2f2befafa929347)

Autor SHA1 Wiadomość Data
Fredrik Öhrström fa87570ea0 Change -NAN to NAN since macosx always renders -NAN as NAN.... 2021-02-03 12:09:41 +01:00
Fredrik Öhrström 9720d0283f Change from stdc++ include to algorithm include. 2021-02-03 10:13:30 +01:00
Fredrik Öhrström bd397261a5 Update manufacturer flag ids. 2021-02-03 07:17:21 +01:00
Fredrik Öhrström 87fe95ef25 Fix mac check when parsing afl is done twice. 2021-01-30 22:19:13 +01:00
Fredrik Öhrström 84960f2245 Restore current_status json key for waterstarm and fix debugging error for info codes. 2021-01-30 18:06:47 +01:00
Fredrik Öhrström d50f13b240 Now properly handles different dll id and tpl id. 2021-01-30 17:58:00 +01:00
Fredrik Öhrström 7226a6a1a2 Adjust field name current_status to just status for the waterstar meter. 2021-01-30 09:26:35 +01:00
Fredrik Öhrström be4b799105 Adjust names for volt and ampere units to be _v and _a in json fields. 2021-01-30 09:07:14 +01:00
Fredrik Öhrström 2a6ba20cbe Include regressions tests for gransystem. 2021-01-30 08:52:25 +01:00
Xael South 2b308ebe1c ccx01 2021-01-29 16:20:54 +00:00
Xael South 4f27d700fd ccx01 2021-01-29 16:20:03 +00:00
Xael South 935667a7b9 add gss cc101 and cc301 2021-01-29 16:00:10 +00:00
Fredrik Öhrström 73c18c1831 Added evo868 water wmbus module. 2021-01-26 22:22:59 +01:00
Fredrik Öhrström f29e819afd Add missin file. 2021-01-26 19:03:12 +01:00
Fredrik Öhrström 0cf7f864dd Properly create IV for AES CBC IV for telegrams having both dll_id and tpl_id. 2021-01-26 18:39:35 +01:00
Fredrik Öhrström 8d8b1a2a9b Added whe5x hca. 2021-01-26 17:17:29 +01:00
Fredrik Öhrström 5b5e9b9dee Print all warnings for first telegram triggering alarms. Only start ignoring alarms for next telegram. 2021-01-24 21:44:20 +01:00
Fredrik Öhrström f780f74384 Allow T1 mode for multical302 2021-01-24 20:36:59 +01:00
Fredrik Öhrström b243686ad6 Fix multical 803 to expect Joule and not KWh in telegram. 2021-01-24 20:06:21 +01:00
Fredrik Öhrström b625b691dd Fix test. 2021-01-24 16:15:34 +01:00
Alex Muthmann 0893c82106
Remove scaling for Techem Compact 5 
As discussed in #217 we don#t need to scale down the values for the heat meter.
 2021-01-24 13:37:03 +01:00
Fredrik Öhrström 650d1c76ab Ignore telegrams matching a wildcard but wrong driver. Keep telegrams with exact id match and wrong driver. 2021-01-24 13:35:44 +01:00
Fredrik Öhrström 28b416dfd6
Merge branch 'master' into feature/Techem_CompactVe 2021-01-24 11:25:51 +01:00
Fredrik Öhrström 5b29b9de4a Added regression test for compact5 heat meter. 2021-01-24 11:18:54 +01:00
Fredrik Öhrström f1c5d6ef9d Fix json field name. 2021-01-24 09:08:36 +01:00
Alex Muthmann 82c6bd3a55 Add support for Compact Ve Heat Meter 2021-01-22 23:36:03 +01:00
Marc-André Kolly 4c9e209746
Standardize status field naming (`status` instead of `current_status`) and implement known error_codes 2021-01-11 15:33:30 +01:00
Marc-André Kolly 3b65f39429
Lorenz Water meter/Engelmann WaterStarM also exists as 0x07 (Water meter) 2021-01-11 15:19:25 +01:00
Fredrik Öhrström cff3eb5b30 Added yet another media type for the izar driver lookup. 2021-01-06 23:15:37 +01:00
Fredrik Öhrström 8f7a681da2 Added fhkvdataiv. 2021-01-06 19:48:56 +01:00
Fredrik Öhrström 0d93f0dcbc Only pring warning unknown or wrong driver once. 2021-01-06 13:46:12 +01:00
Fredrik Öhrström 6638e4f88f Only print warning about failed decryption once. 2021-01-06 12:46:37 +01:00
Fredrik Öhrström 18cbf887b2 Added minimal stub for tsd2. 2020-12-31 14:46:05 +01:00
Fredrik Öhrström eb33a0bf13 Prevent wmbusmeters from being confused by a file named rtlwmbus. 2020-12-31 10:42:53 +01:00
Fredrik Öhrström 781b084260 Add error message detecting missing pidfile argument to daemon. 2020-12-31 10:18:43 +01:00
Fredrik Öhrström cde87b9698 Added stub for whe46x driver, meter not yet understood. 2020-12-28 19:20:31 +01:00
Fredrik Öhrström 2616f64cb7 Fix for omnipower provided by janusboandersen. 2020-12-28 17:47:21 +01:00
dddevvv 871a9a5872 add M3/H to/from L/H conversion 2020-12-17 22:10:14 +00:00
dddevvv 73d4f9d680 multical403: recognize 0xF VIF byte (energy MJ) 2020-12-17 22:07:52 +00:00
Fredrik Öhrström ba0a916207
Merge pull request #195 from balczezzz/balczezzz-patch-2 
Add files via upload
 2020-12-10 18:09:07 +01:00
Fredrik Öhrström 8070d6e638
Merge pull request #196 from balczezzz/balczezzz-patch-1 
Update dvparser.h
 2020-12-10 18:08:54 +01:00
balczezzz 43b44e9217
Update meters.h 
Support for BMETERS HYDROCALM3
 2020-12-09 22:16:44 +01:00
balczezzz 4667f56840
Add files via upload 
Added meter file for BMETERS HYDROCALM3
 2020-12-09 22:10:12 +01:00
balczezzz 05b2b91024
Update dvparser.h 
Extended the ReturnTemperature to 0x5E to accommodate BMETERS HYDROCALM3
 2020-12-09 21:04:20 +00:00
Fredrik Öhrström 7460ad0b5c Detect 0x08 type for fhkvdataiii. 2020-12-08 14:17:41 +01:00
Fredrik Öhrström 91a4e7de6e Detect version 0x70 for mkradio4 water meters. 2020-12-08 10:19:41 +01:00
Fredrik Öhrström ad535f888f Detect version 0x94 for fhkvdataiii. 2020-12-08 10:16:24 +01:00
Damian Wrobel 6469e1ccab Fix rtl_sdr invalid option 
Fixes the following invalid option in the log:

 (shell) exec (capture output) "/bin/sh"
 (shell) wmbusmetersd[8259]: (shell) arg "-c"
 (shell) arg "rtl_sdr --help < /dev/null"
 (shell) output: >>>rtl_sdr: invalid option -- '-'
         rtl_sdr, an I/Q recorder for RTL2832 based DVB-T receivers

         Usage:         -f frequency_to_tune_to [Hz]
                       [-s samplerate (default: 2048000 Hz)]
                       [-d device_index (default: 0)]
                       [-g gain (default: 0 for auto)]
                       [-p ppm_error (default: 0)]
                       [-b output_block_size (default: 16 * 16384)]
                       [-n number of samples to read (default: 0, infinite)]
                       [-S force sync output (default: async)]
                       filename (a '-' dumps samples to stdout)

         <<<

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2020-12-07 21:30:45 +01:00
Fredrik Öhrström 14ad435d02 Added support for multical803. 2020-12-05 12:01:33 +01:00
Fredrik Öhrström c4239412a0 Add warning when using auto,rtlsdr dongle and rtl_wmbus/sdr is missing. 2020-12-05 11:33:47 +01:00
Erwan Martin ca8803e033 Add FreeBSD support for the latest release. 2020-11-28 14:18:18 +01:00
Fredrik Öhrström 2b39daab39 Fix bug where --device=yyy did not remove conf devices. 2020-11-25 19:34:36 +01:00
Fredrik Öhrström 1e94a81183 Added type/ver for yet another moronic Izar meter that reports itself as a electric breaker.... 2020-11-25 11:34:14 +01:00
cinemarene 8879b89384
Fix wrong copy paste 2020-11-22 21:25:36 +01:00
cinemarene 9877bfbbee
Update files for MKRadio4 2020-11-22 20:39:28 +01:00
cinemarene c40a0891b3
Copy MKRadio3 for MKRadio4 2020-11-22 20:34:53 +01:00
Fredrik Öhrström 3735c9fa70 Added ev200 and emerlin868. 2020-11-14 10:48:49 +01:00
Fredrik Öhrström dcb46566da Do not print >already configured< forever in debug mode. 2020-11-12 10:26:12 +01:00
Fredrik Öhrström b3ab49c090 Added support for --selectfields=rssi_dbm,device 2020-11-12 09:56:51 +01:00
Fredrik Öhrström 5c2c914070 Now handles /dev/ttyUSB0 coming and going. 2020-11-12 00:59:12 +01:00
Fredrik Öhrström 6fd4d559d4 Handle unexpected device on tty. 2020-11-12 00:43:35 +01:00
Fredrik Öhrström f42032732c Add --nodeviceexit 2020-11-12 00:43:01 +01:00
Fredrik Öhrström a610179331 Enable stdin/file/simulation before event loop started, enable other devices after event loop started. 2020-11-11 22:49:20 +01:00
Fredrik Öhrström 1f4083e6d0 Start eventloop after first detect of stdin device. 2020-11-11 21:44:50 +01:00
Fredrik Öhrström 3b86b00b96 Added --silent and test for stdin pipe close down. 2020-11-11 19:29:00 +01:00
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
Fredrik Öhrström 7e07af03e7 Added resetafter, regular reset. 2020-09-25 23:56:50 +02:00
Fredrik Öhrström 7c361ce9ac Removed reopenafter. 2020-09-25 22:34:35 +02:00
Fredrik Öhrström 8568437635 Partially removed reopenafter. 2020-09-25 22:27:34 +02:00
Fredrik Öhrström de24888b4e Moved listenTo/onDissapear to common implementation. 2020-09-25 21:58:09 +02:00
Fredrik Öhrström 467d15845a Moved command_wait into common implementation for wmbus devices. 2020-09-25 21:47:21 +02:00
Fredrik Öhrström 371a3c3cf1 Stop early if listening mode is set for auto and no meters. 2020-09-25 21:35:17 +02:00
Fredrik Öhrström 6ecd278656 Properly resets wmbus dongle on alarm. 2020-09-25 21:16:20 +02:00
Fredrik Öhrström 0e076fce24 Print id for ignored telegrams when verbose logging. 2020-09-25 19:14:34 +02:00
Fredrik Öhrström 27bda218fb Do not select on non-opened file descriptors. 2020-09-25 18:40:14 +02:00
Fredrik Öhrström 5fe7789e3b Remove unused bus variable. 2020-09-25 18:13:43 +02:00
Fredrik Öhrström bf053685c8 Interrupt the select at the proper time when a new file descriptor is added. 2020-09-25 18:08:41 +02:00
Fredrik Öhrström 5ac2bdd37a Now properly reads all data from child-process that has exited. 2020-09-25 17:34:47 +02:00
Fredrik Öhrström 1022a24799 Non-working implies opened first. 2020-09-25 17:02:42 +02:00
Fredrik Öhrström 0d9d856b6a Make a distinction between not yet opened and not working serial devices. 2020-09-25 16:38:40 +02:00
Fredrik Öhrström ecd60045d9 Merge 2020-09-25 15:37:34 +02:00
Emil Madsen db7acae6cd Added Apparent Power to interface and meter 2020-09-24 21:23:06 +02:00
Emil Madsen 65ad8f624c Add support for the Gavazzi EM24 2020-09-24 19:49:45 +02:00
elbaek89 781b0af144
added extractDVuint32 (copy of extractDVuint24) 2020-09-24 13:29:25 +02:00
elbaek89 ee445f37e0
added extractDVuint32 2020-09-24 13:10:34 +02:00
elbaek89 25e945f955
Added multical 603 
Meter detection entries based on the following telegram header obtained by using wmbusmeters -listento=c1 * 

Received telegram from: 80363608
          manufacturer: (KAM) Kamstrup Energi (0x2c2d)
           device type: Heat meter (0x04)
            device ver: 0x35
         device driver: unknown!
 2020-09-23 08:35:28 +02:00
elbaek89 f840f96314
Added multical 603 meter file 
v1 copy of meter_multical403.cc with 403 replaced with 603 everywhere.
 2020-09-23 08:31:18 +02:00
Fredrik Öhrström 09821cf389 Rewrote locking from scratch switch to shared_ptr. 2020-09-21 21:55:21 +02:00
Fredrik Öhrström 71ef2b2784 Improved locking. 2020-09-18 21:22:08 +02:00
Fredrik Öhrström 891e3f4228 Alarm test work again. 2020-09-18 20:05:59 +02:00
Fredrik Öhrström 802e62cbbd Now logging defaults to stderr. 2020-09-13 16:55:22 +02:00
Fredrik Öhrström 71804f1d92 Audo detect swradio to start rtlwmbus. 2020-09-13 15:39:09 +02:00
Fredrik Öhrström e754cda295 Added --listmeters and --listmeters=water 2020-09-13 13:24:46 +02:00
Fredrik Öhrström 09e36b8999 Daemon working again. 2020-09-08 23:05:42 +02:00
Fredrik Öhrström 93272b1b0c Added missing include. 2020-09-08 22:34:24 +02:00
Fredrik Öhrström 409ca51819 Updated --listenvs=<meter_type> and --listfields=<meter_type> 2020-09-08 22:11:32 +02:00
Fredrik Öhrström c12a0e8e19 Most tests pass. 2020-09-08 20:50:51 +02:00
Fredrik Öhrström 570c0c5454 Now simulations work. 2020-09-08 14:55:01 +02:00
Fredrik Öhrström 04175023a8 Now properly activates meters. 2020-09-07 13:15:38 +02:00
Fredrik Öhrström d127f46807 Properly ignores non-wmbus devices. 2020-09-07 10:36:39 +02:00
Fredrik Öhrström 1653aea0b2 Detection loop is working. 2020-09-06 10:41:04 +02:00
Fredrik Öhrström b1fce2769a Merge branch 'master' into NewDetectionCode 2020-09-05 11:08:12 +02:00
Fredrik Öhrström a048982f8b With debug enable, printELL and printTPL even if decryption failed. 2020-09-04 14:03:25 +02:00
Fredrik Öhrström 27a590e135 Merge master. 2020-09-04 13:17:09 +02:00
Fredrik Öhrström c5d445b9b3 Added izar3 stub. 2020-09-04 12:13:06 +02:00
Fredrik Öhrström 481e156cf2 Added version 0x0b to lansenpu. 2020-09-04 11:52:30 +02:00
Fredrik Öhrström c48ad8e368 Added driver detection from telegrams. 2020-09-04 11:31:49 +02:00
Fredrik Öhrström 92c003f4b5 Merge master. 2020-09-02 14:38:47 +02:00
Fredrik Öhrström 8e6d39492d Update README. 2020-09-02 14:36:10 +02:00
Fredrik Öhrström ecce6a2c08 Added test case and updated README. 2020-09-02 13:17:52 +02:00
Arthur van Dorp 3190ef9e7c Add support for AquaMetro / Integra Topas Es Kr water meter 2020-09-01 21:53:05 +02:00
Fredrik Öhrström 1378d50700 Add files. 2020-08-30 21:47:47 +02:00
Fredrik Öhrström ab521e257d Merge master 2020-08-30 21:40:50 +02:00
Fredrik Öhrström 69df7f022a Detect and start wmbus dongles from within wmbusmeters. 2020-08-30 21:33:48 +02:00
Fredrik Öhrström ea783a3daf
Merge pull request #139 from IzeQube/master 
Added Techem Compact V heatmeter
 2020-08-26 08:45:28 +02:00
Fredrik Öhrström e3e0a636c8 Updated CHANGES 2020-08-23 20:33:50 +02:00
Fredrik Öhrström 78a353de59 Restore event loop start and disable getconfig in amb8465 reset. 2020-08-19 20:45:38 +02:00
Fredrik Öhrström b7dffe39f1 Start event loop before configuring wmbus dongle. 2020-08-19 20:11:18 +02:00
Fredrik Öhrström 15a3e6f94a Update README with information on rtl433. 2020-08-19 10:59:14 +02:00
eborned 100d9110ac Revert debug change. 2020-08-18 18:55:06 +02:00
eborned b40c2cdf5b Added meter code for Multical 403 2020-08-18 18:20:30 +02:00
Fredrik Öhrström aa24eac099 Make time period test work independent of timezone of build server. 2020-08-16 16:52:31 +02:00
Fredrik Öhrström afc24d5ea2 Merge branch 'master' into AddAlarm 2020-08-16 16:26:08 +02:00
Fredrik Öhrström 01554aaa82 Use getispeed instead of masking control bits. 2020-08-16 15:50:43 +02:00
Fredrik Öhrström e7a94a1423 Fix #ifdef pragmas. 2020-08-16 15:31:28 +02:00
Fredrik Öhrström d4b47f65b0 Adjusted static for clang again... 2020-08-16 14:38:26 +02:00
Fredrik Öhrström 4aeaceb9f8 Remove static to avoid clang complaint. 2020-08-16 12:33:06 +02:00
Fredrik Öhrström 4c089246b8 Added debug information of serial tty flags. 2020-08-16 12:18:20 +02:00
Fredrik Öhrström 157ce8026b Merge master. 2020-08-11 00:06:02 +02:00
Fredrik Öhrström b11b097041 Merge branch 'master' into AddAlarm 2020-08-10 23:37:39 +02:00
Fredrik Öhrström 7e6c57ad48 Added support for rtl_433 to decode wmbus radio signals. 2020-08-10 23:00:41 +02:00
Fredrik Öhrström 422793be04 Fix test. 2020-08-10 21:29:39 +02:00
Fredrik Öhrström 99876d175b Do not stop wmbusmeters while resetting. 2020-08-10 21:20:54 +02:00
Fredrik Öhrström 0bc6d81b95 Merge branch 'master' into AddAlarm 2020-08-10 20:57:24 +02:00
Fredrik Öhrström 3c8150377c Prevent timers from being started again while already running. 2020-08-10 20:57:20 +02:00
Fredrik Öhrström 555cfa7466 Send SIGTERM to process group to properly dispatch background shell. 2020-08-10 20:22:58 +02:00
Fredrik Öhrström f9ab051a40 Merge branch 'master' into AddAlarm 2020-08-09 17:18:37 +02:00
Fredrik Öhrström a42e8c9a5f Updated comment. 2020-08-09 17:05:55 +02:00
Fredrik Öhrström c71c35f1cb Send SIGTERM to pid instead of SIGINT to group. 2020-08-09 17:03:59 +02:00
Fredrik Öhrström a623807858 New thread for timer callbacks to prevent deadlock. 2020-08-03 19:49:03 +02:00
Fredrik Öhrström 0843b19379 Adjust alarm type. 2020-08-01 22:24:23 +02:00
Fredrik Öhrström 5038753906 Add alarm functionality. 2020-08-01 21:56:46 +02:00
Fredrik Öhrström c12d0995b6 Support Waterstar M meter. 2020-07-30 12:19:54 +02:00
Fredrik Öhrström 8191f45888 Inital work to add alarms. 2020-07-30 11:18:44 +02:00
IzeQube 5fd9d3a4f5 Added Techem Compact V heatmeter 2020-07-26 15:04:18 +02:00
Fredrik Öhrström 0e08f83e45 Now handles partially encrypted AES CBC telegrams. 2020-07-09 14:51:28 +02:00
Fredrik Öhrström e84eb18cfa Added meter waterstarm. 2020-07-08 21:16:26 +02:00
Fredrik Öhrström d8c68f94bc Added support for lansen pulse counter. 2020-06-30 16:02:38 +02:00
Fredrik Öhrström 3a7931fd07 Added support for lansen door/window sensor. 2020-06-30 11:29:55 +02:00
Fredrik Öhrström 24a42cbadc Improve logging when testing ttys. 2020-06-29 18:33:55 +02:00
Fredrik Öhrström f3e2968833 Added reset of amb8465 to admin-tool. 2020-06-29 16:35:58 +02:00
Fredrik Öhrström 310406fddd Added support for Lansen Smoke detector. 2020-06-22 10:44:47 +02:00
Fredrik Öhrström 7a55d21561 Fix for clang compiler. 2020-05-30 19:12:05 +02:00
Fredrik Öhrström 2565f766a9 More work in the admin tool. 2020-05-30 18:45:29 +02:00
Fredrik Öhrström dec92e58a5 Added experimental support for older version of rfmtx1. 2020-05-30 09:47:39 +02:00
Fredrik Öhrström 0782557fb4 Fix bug that printed unnecessary warning for flowiq3100 meters. 2020-05-28 07:51:34 +02:00
Henry N 776287c011
amb8465: Find next start 0x44, after out of sync 
Should fix problems in #116
 2020-05-27 13:12:52 +02:00
Fredrik Öhrström ff24b5d3e9 Avoid format truncation warning in recent g++. 2020-05-27 05:57:10 +02:00
Fredrik Öhrström 76d76d1276 Disable format-truncation warning that is somewhat flaky in gcc. 2020-05-26 09:34:17 +02:00
Damian Wrobel 6814ab35cd Remove executable bit 
Fixes the following warnings while building rpm package:

 *** WARNING: ./usr/src/debug/wmbusmeters-0.9.31-2.fc33.x86_64/src/meter_izar.cc is executable but has no shebang, removing executable bit
 *** WARNING: ./usr/src/debug/wmbusmeters-0.9.31-2.fc33.x86_64/src/meters.cc is executable but has no shebang, removing executable bit
 *** WARNING: ./usr/src/debug/wmbusmeters-0.9.31-2.fc33.x86_64/src/meters_common_implementation.h is executable but has no shebang, removing executable bit
 *** WARNING: ./usr/src/debug/wmbusmeters-0.9.31-2.fc33.x86_64/src/units.cc is executable but has no shebang, removing executable bit
 *** WARNING: ./usr/src/debug/wmbusmeters-0.9.31-2.fc33.x86_64/src/units.h is executable but has no shebang, removing executable bit

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2020-05-25 22:12:33 +02:00
Fredrik Öhrström 950778d7bc Detect out of sync data from amb8465. 2020-05-25 19:05:45 +02:00
Henry N fddeab4841
amb8465: rx timeout to resync telegram (#117) 
* rx timeout 2 sec in telegram 

If the reader is out of sync, next meter start bytes will add to the rest of telegram before. Typically are 7 ms between two chunks of received data. If detected a delay of 2 seconds or more between the rx data, then assume it is the first block of new telegram.
This should fix the issue #116.
 2020-05-25 09:28:31 +02:00
Fredrik Öhrström eab0e9f940 Build fix. 2020-05-11 12:19:50 +02:00
Fredrik Öhrström 3b96b8de9d Remove compile warning. 2020-05-11 12:04:45 +02:00
Fredrik Öhrström 2cc26129b4 Fix build problems. 2020-05-11 11:59:47 +02:00
Fredrik Öhrström 20bc6c6a02 Add --selectfields=... 2020-05-09 23:46:07 +02:00
Fredrik Öhrström 4d9ede4d04 Fix OSX build. 2020-05-09 22:13:38 +02:00
Fredrik Öhrström 2c366bf6a7 Added prototype for wmbusmeters-admin. 2020-05-09 21:56:37 +02:00
Fredrik Öhrström 6fa1fa39ce Merge remote-tracking branch 'origin/master' into AddAdminTool 2020-05-09 11:18:25 +02:00
Fredrik Öhrström 866e163d3b
Merge branch 'master' into HenryNe-patch-cs-print 2020-05-09 08:25:15 +02:00
Henry N 0159f4c449
amb8465: Print rssi after full command frame 
Just to have the same order as before.
 2020-05-08 22:20:10 +02:00
Henry N 585bec9e39
amb8465: Print checksum errors from responses 2020-05-08 22:11:26 +02:00
Henry N 8d283533c3
amb8465: Print rssi in dBm 2020-05-08 22:06:33 +02:00
Henry N c229cb3d0f
amb8465: Update rssi from transparant data 
Update rssi from transparent rx data.
Print rssi only after get an update of rssi (CMD_DATA_IND or transparent RX).
 2020-05-08 22:02:22 +02:00
Henry N 60ddad6e1d
amb8465: Fix: RSSI is only in CMD_DATA_IND 
Byte for rssi is only injected in responses from CMD_DATA_IND.
rssi is -2 bytes before end, because -1 byte is the CheckSum.
Fix calculation for frame_length.
frame_length = 1 byte start (0xFF) + 1 byte CMD (0x8A) + 1 byte len (0x7A) + payload_len + 0/1 byte RSSI + 1 byte Check Sum = 4 + payload_len.
PS: The old code was working, because rssi_expected_ was always true (1).
 2020-05-08 21:56:20 +02:00
Henry N b955c692d5
amb8465: Fix: Update config RSSI_Enable = false 
Bugfix: Update local "rssi expected" to false, If RSSI is not set in config.
 2020-05-08 21:38:09 +02:00
Henry N a8f7517290
amb8465: Print config UART_CMD_OUT_ENABLE 2020-05-08 21:29:02 +02:00
Fredrik Öhrström 36e213e49a Support comments (lines starting with #) in the conf and meter files. 2020-05-06 09:41:29 +02:00
Fredrik Öhrström 3edd661667 Add heuristic to apator162 decoding. 2020-04-30 09:15:01 +02:00
Erwan Martin e9163063b8 Add the alarms to the IZAR meters. 2020-04-25 13:30:23 +02:00
Erwan Martin 85f18ae3b1 In the IZAR meter, add the remaining battery life of the module. 2020-04-22 22:38:40 +02:00
Erwan Martin b967372c5b In the IZAR meter, add the reported date when the second measurement was taken (the last billable period measure, i.e. the end of the month) 2020-04-22 22:09:48 +02:00
Erwan Martin 877e865f3c Merge remote-tracking branch 'github/master' into add-freebsd-support 2020-04-21 18:34:20 +02:00
Erwan Martin 6f323b30e6 Add support for FreeBSD. 2020-04-21 18:07:46 +02:00
Fredrik Öhrström 315d7f02c8 Start working on admin tool. 2020-04-03 11:58:19 +02:00
Fredrik Öhrström 19905f100d Add rfmtx1 stub. 2020-04-01 17:21:49 +02:00
Fredrik Öhrström 17cc575b87 Add support for extractin mfct data. 2020-04-01 17:21:11 +02:00
Fredrik Öhrström bb1f03fd2a Improve logging. 2020-03-28 19:29:58 +01:00
Fredrik Öhrström 1d8b070c67 The wmb13u dongle cannot be supported because it hangs. 2020-03-28 18:10:21 +01:00
Fredrik Öhrström b6a2776e79 Temporarily disable detection. 2020-03-24 16:07:41 +01:00
Fredrik Öhrström 95e347ef39 Added setlink and getconfig. 2020-03-23 18:58:34 +01:00
Fredrik Öhrström ef4ccd72ce Fix messages. 2020-03-23 07:40:40 +01:00
Fredrik Öhrström 47f3a8caac Remove 3 last bytes from telegram. 2020-03-22 22:38:32 +01:00
Fredrik Öhrström 7635b11f5f Try to detect. 2020-03-22 18:43:09 +01:00
Fredrik Öhrström 7b9e9a3b8d Started working on wmb13u dongle. 2020-03-22 14:20:47 +01:00
weetmuts 90b3f28bbb Fix AES-CTR decryption. 2020-03-13 10:49:22 +01:00
weetmuts 5b3b6f9bda Add manufacturer specific ci_field 0xa1. 2020-03-10 13:32:57 +01:00
Fredrik Öhrström 0d92f47b63
Merge pull request #86 from dwrobel/dw-fix-empty-string-crash 
Fix accessing empty string
 2020-03-02 16:55:21 +01:00
Damian Wrobel 1d2f9c4c72 Fix compilation error on gcc 10.x 
Fixes the following compilation error:

 In file included from src/config.h:21,
                  from src/cmdline.h:21,
                  from src/cmdline.cc:18:
 src/units.h:42:11: error: extended character ° is not valid in an identifier
    42 |     X(C,c,°C,Temperature,"celsius")         \
       |           ^
 src/units.h:43:11: error: extended character ° is not valid in an identifier
    43 |     X(F,f,°F,Temperature,"fahrenheit")      \
       |           ^
 make: *** [Makefile:93: build/cmdline.o] Error 1

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2020-03-02 16:22:11 +01:00
Damian Wrobel a2de4d4b9b Fix accessing empty string 
Fixes the following crash:
 (gdb) bt
 #0  0x00005555555738d0 in abort@plt ()
  #1  0x0000555555589888 in std::__replacement_assert (__file=<optimized out>, __line=<optimized out>, __function=<optimized out>, __condition=<optimized out>) at /usr/include/c++/9/x86_64-redhat-linux/bits/c++config.h:2533
 #2  0x00005555555d1e37 in std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::front (this=0x7ffff7a226d0) at /usr/include/c++/9/bits/basic_string.h:1123
 #3  0x00005555555ce8c5 in doesIdMatchExpression (id=..., match=...) at src/util.cc:513
 #4  0x00005555555cea92 in doesIdMatchExpressions (id=..., mes=...) at src/util.cc:560
 #5  0x000055555558aa56 in MeterCommonImplementation::isTelegramForMe (this=0x555555661c28, t=0x7ffff7a227b0) at src/meters.cc:188
 #6  0x000055555558c0e0 in MeterCommonImplementation::handleTelegram (this=0x555555661c28, input_frame=...) at src/meters.cc:289
 #7  0x000055555558c87a in MeterCommonImplementation::<lambda(std::vector<unsigned char, std::allocator<unsigned char> >)>::operator() (__closure=<optimized out>, input_frame=...) at /usr/include/c++/9/bits/stl_algobase.h:465
 #8  std::_Function_handler<bool(std::vector<unsigned char, std::allocator<unsigned char> >), MeterCommonImplementation::MeterCommonImplementation(WMBus*, MeterInfo&, MeterType, int)::<lambda(std::vector<unsigned char, std::allocator<unsigned char> >)> >::_M_invoke(const std::_Any_data &, std::vector<unsigned char, std::allocator<unsigned char> > &&) (__functor=..., __args#0=...) at /usr/include/c++/9/bits/std_function.h:285
 #9  0x00005555555da01f in std::function<bool (std::vector<unsigned char, std::allocator<unsigned char> >)>::operator()(std::vector<unsigned char, std::allocator<unsigned char> >) const (__args#0=..., this=0x7ffff7a22c70) at /usr/include/c++/9/bits/std_function.h:685
 #10 WMBusCommonImplementation::handleTelegram (this=this@entry=0x555555661b40, frame=...) at src/wmbus.cc:3328
 #11 0x00005555555fbf7b in WMBusRTLWMBUS::processSerialData (this=0x555555661ad0) at /usr/include/c++/9/bits/stl_algobase.h:465
 #12 0x00005555555cb001 in std::function<void ()>::operator()() const (this=<optimized out>) at /usr/include/c++/9/bits/std_function.h:685
 #13 SerialCommunicationManagerImp::eventLoop (this=0x5555556617c0) at src/serial.cc:795
 #14 0x00007ffff7f554e2 in ?? ()
 #15 0x0000000000000000 in ?? ()

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2020-03-02 16:21:33 +01:00
weetmuts 9ce676675a Fix problem with rtl_sdr hanging when stopping daemon. 2020-02-26 11:02:47 +01:00