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

583 Commity (678a3a8a0a82f5ac31a3e068d82e1f3e32dc0f0c)

Autor SHA1 Wiadomość Data
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
weetmuts 33952d803f Added divide by 3 to apator08. 2020-02-23 18:41:21 +01:00
weetmuts b608ae3220 Added missing file. 2020-02-23 14:49:51 +01:00
weetmuts f6df66d293 Added experimental support for apator08. 2020-02-23 13:55:37 +01:00
weetmuts f99dbadf88 Added --usestderr option. Added version 0x7c to iperl. install.sh now adds user to wmbusmeters group. 2020-02-22 21:16:24 +01:00
weetmuts 6e844dc1c2 Fix cul driver C1 mode. 2020-02-18 20:48:00 +01:00
weetmuts edd523a64b Added more guessing for the apator162. 2020-02-18 07:41:31 +01:00
weetmuts baa88b8270 Added 0x84 to apator162 guessing. 2020-02-17 19:10:35 +01:00
weetmuts b3a1d30f22 Only invoke binary test if using the default command line. 2020-02-17 18:14:04 +01:00
weetmuts 17067e44ec Improved error message and README. 2020-02-17 18:09:27 +01:00
weetmuts d7fbf3a3a8 Added info message when /usr/bin/rtl_sdr or /usr/bin/rtl_wmbus is missing. 2020-02-17 12:16:45 +01:00
weetmuts 126a503870 Fix bug when trimming frame A telegram which is a multiple of 18 bytes. 2020-02-16 20:58:59 +01:00
weetmuts b42c3f3af4 Improved cul driver. 2020-02-16 20:23:47 +01:00
Fredrik Öhrström 5f7324562a
Merge pull request #77 from cinemarene/master 
Ignore manufacturer specific header sizes changes
 2020-02-16 19:16:32 +01:00
weetmuts a7c059d5df Added proper CRC trimming for CUL driver. 2020-02-15 21:18:21 +01:00
cinemarene 34a5297093
Ignore manufacturer specific header sizes changes 2020-02-12 23:28:09 +01:00
cinemarene b374d9fc19 Revert "Ignore manufacturer specific header sizes changes" 
This reverts commit cc9d19c6ae.
 2020-02-12 23:22:44 +01:00
cinemarene cc9d19c6ae
Ignore manufacturer specific header sizes changes 2020-02-12 23:16:54 +01:00
weetmuts 2f2f4a1e58 Small fixes. 2020-02-12 07:52:29 +01:00
cinemarene 895f0ee577
Add SUM of p1-p3 2020-02-11 22:37:20 +01:00
cinemarene 9525758863
Add Techem FHKV data II/III 2020-02-11 22:35:57 +01:00
weetmuts af98f363cd Reverse esysm strings. 2020-02-07 12:34:44 +01:00
weetmuts 103f0da4cf Fix bug in esyswm. 2020-02-07 07:39:01 +01:00
weetmuts 8666dd95a1 New version. 2020-02-06 19:36:01 +01:00
weetmuts ed4e6e2d34 Updated fields esyswm. 2020-02-06 19:23:58 +01:00
weetmuts 0f74dba6e9 Added more debug information. 2020-02-06 19:01:48 +01:00
weetmuts 7236c7893b Added missing file. 2020-02-06 18:22:05 +01:00
weetmuts 9700d9da1a Added fields tests for t1 meters. 2020-02-06 18:22:05 +01:00
weetmuts 07ccc1cea5 Add test for esyswm. 2020-02-06 18:22:05 +01:00
weetmuts 9686e8d96f Improve logging. 2020-02-06 18:22:05 +01:00
weetmuts fb16103de8 More logging. 2020-02-06 18:22:05 +01:00
weetmuts 47f786e76a More debug info. 2020-02-06 18:22:05 +01:00
weetmuts d3618122cf Fix 2020-02-06 18:22:05 +01:00
weetmuts 8f131f7da9 Add more debugging. 2020-02-06 18:22:05 +01:00
weetmuts 884aed37ba Add eBZ wmbus meter. 2020-02-06 13:14:46 +01:00
weetmuts 9282625887 Fix bug in auto detection of wmbus dongles. 2020-02-06 07:56:33 +01:00
weetmuts 59af0693ed Updated explanation texts. 2020-02-04 18:47:13 +01:00
weetmuts 08f49305b3 Added debug info if mac fails. 2020-02-04 18:00:42 +01:00
weetmuts 1ae56f2480 Added sem_init to cul. 2020-02-04 16:08:15 +01:00
weetmuts 399f357496 Fix cul. 2020-02-04 14:46:48 +01:00
weetmuts 590a94e870 Added another offset to apator162. 2020-02-04 07:44:49 +01:00
Fredrik Öhrström 66d2deeece
Merge pull request #70 from weetmuts/ImproveCUL 
Improve cul
 2020-02-03 20:09:22 +01:00
weetmuts e711d6efd3 Ignore telegram where decryption/mac fails. 2020-02-03 18:39:07 +01:00
weetmuts 7b55c38fe9 Improved CUL driver. 2020-02-03 18:20:03 +01:00
weetmuts 6db842f1e6 Merge branch 'master' into ImproveCUL 2020-02-03 17:54:53 +01:00
weetmuts 7c1eb8eefa Added dll_len workaround for rtl_wmbus. 2020-02-03 17:41:46 +01:00
weetmuts cbea89a91f Added dll_len workaround for rtl_wmbus. 2020-02-03 17:40:48 +01:00
weetmuts b677bc4021 Updated izar. 2020-02-02 21:31:46 +01:00
weetmuts 9ed100cd07 CUL now supports setting different link modes. 2020-02-02 20:49:26 +01:00
weetmuts ffeed3f798 Updated README and fixed auto rtlsdr problem. 2020-02-02 17:05:10 +01:00
weetmuts 7f7fb464c2 Added buffer length checks. 2020-01-31 12:44:23 +01:00
weetmuts 876cff5a5e Added static information for esyswm. 2020-01-31 10:30:38 +01:00
weetmuts 8acff4bc13 Added check of MAC authentication. 2020-01-30 15:45:37 +01:00
weetmuts c02eb8a564 Fix 2020-01-29 07:57:55 +01:00
weetmuts 67a9d70b7a Added support for the esyswm electricity meter addon. 2020-01-29 07:42:24 +01:00
weetmuts e944f3c13f Added ehzp electricity meter. 2020-01-28 19:09:39 +01:00
weetmuts d81a573c6c Added key derivation function. 2020-01-28 16:33:02 +01:00
weetmuts a6c73e10db Add aescmac for more security modes. 2020-01-28 16:15:11 +01:00
weetmuts 35ab71bf0d Added Q400 water meter and CMa12w room sensor. 2020-01-27 16:53:18 +01:00
weetmuts 4c27f6c11c Refactor parsing. 2020-01-27 09:29:40 +01:00
weetmuts 4cf462b9b9 Refactoring parser. 2020-01-20 20:41:33 +01:00
weetmuts 62ebea3244 Fstat does not work for me, but checking the device file does. 2020-01-19 23:24:38 +01:00
Michal Bursa 3bdad1b302 SerialDeviceTTY::working() now uses fstat() to see if device is working 2020-01-19 22:47:05 +01:00
Michal Bursa 210148b223 implement a check if tty device is working 2020-01-19 20:48:20 +01:00
Michal Bursa 2404330740 a fix for cmdline override in daemon mode 2020-01-19 19:31:08 +01:00
weetmuts 315e216efc Added support for cmdline override of config file for device and listento. 2020-01-19 17:55:46 +01:00
weetmuts 1d61456991 Work on proper CI decoding. 2020-01-19 16:52:33 +01:00
weetmuts d429c9d153 Fix CI fields. 2020-01-18 16:25:55 +01:00
weetmuts 466d7415b1 Improved understanding of CI-fields. 2020-01-18 16:01:36 +01:00
weetmuts ff88bd4d35 Added Dockerfile 2020-01-09 18:42:02 +01:00
weetmuts 7fa9f1079a Added support for d1tc wmbus dongle. 2019-12-28 11:19:50 +01:00
weetmuts 389b72cbfb Added yet another apator162 offset. 2019-12-28 10:33:18 +01:00
weetmuts cf7efb8127 Added support for meterfilestimestamp 2019-12-11 18:56:34 +01:00
weetmuts bf233da26c Added support for Hydrodigit water meter. 2019-12-07 14:46:28 +01:00
weetmuts b0caefa115 Added better text explaining format hashes. 2019-12-06 16:08:51 +01:00
weetmuts fb6ab7acbc Added another hash for compressed format signature. 2019-12-06 15:56:56 +01:00
weetmuts fc5444a2d2 Added format signature for hash 0xf1e7 multical302 2019-11-26 21:54:46 +01:00
weetmuts b39080f10f Correctly supported Multical302 meter. 2019-11-26 16:12:32 +01:00
weetmuts 78d7eb55da Added support for Hydrus meter. 2019-11-26 14:24:17 +01:00
chester4444 582e7285cb
modified for CUL support 2019-11-22 18:53:52 +01:00
chester4444 a7e6cdde2f
adding support for CUL devices 2019-11-22 18:50:55 +01:00
Jacek Tomasiak f9b7626d04 Added env variable with meter name 2019-11-21 09:25:39 +01:00
weetmuts e86d32168b Added logging of data inside sn in ci=0x8d transport. 2019-11-20 07:14:35 +01:00
weetmuts d257228235 Fix bug that prevented /bin/sh in busybox from working. 2019-11-18 07:33:25 +01:00