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

356 Commity (ef59dad7cd2b1dc7c754768361175139337a4c8e)

Autor SHA1 Wiadomość Data
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
Fredrik Öhrström 260e53e046
Merge pull request #42 from skazi0/izar 
Diehl/Sappel IZAR Water meter support
 2019-11-10 08:02:22 +01:00
weetmuts bb7927f8f1 Added checks to handle corrupted telegrams. 2019-11-04 00:35:00 +01:00
weetmuts d3e221ffbf Updated README 2019-11-03 23:43:29 +01:00
weetmuts cae1144283 Improved testing. 2019-11-03 22:00:18 +01:00
weetmuts 291c0b2452 Continuous stream on stdin now works. 2019-11-03 17:05:08 +01:00
weetmuts 28d5495882 Added support for stdin and file.\n 2019-11-03 16:31:30 +01:00
Jacek Tomasiak 7e6d075d94 Fix medium type in IZAR meter output 
For some reason IZAR meters return "oil" as medium type.
Added override should hide this problem and return correct "water" type.
 2019-11-01 23:30:16 +01:00
Jacek Tomasiak 061e6e3cec Extract "last month total" from Izar telegrams 
This is a snapshot of total consumption value take around end of
last month.
 2019-11-01 22:47:00 +01:00
Jacek Tomasiak 573c999cff Add custom PRIOS key support 2019-10-29 21:48:37 +01:00
Jacek Tomasiak 302b08a478 Add Izar water meter support 2019-10-29 21:48:36 +01:00
weetmuts 7876804a0b Add recovery when rawtty gets out of sync. 2019-10-28 22:10:29 +01:00
weetmuts 97cb924f35 Enable listento=t1,c1 in conf file. 2019-10-25 10:41:51 +02:00
weetmuts bfc3ba14af Updated README 2019-10-24 21:06:33 +02:00
weetmuts 6e9a6e33e2 Updated CHANGES and README. 2019-10-20 21:46:48 +02:00
weetmuts bfd7f843de Update json for rfmamb. 2019-10-20 21:39:42 +02:00
weetmuts 5d41faf710 Added explicit rfmrx2 device. 2019-10-20 20:39:12 +02:00
weetmuts 30543f6217 Added support for additional static json info. 2019-10-20 19:19:17 +02:00
weetmuts df790c8335 Fix bug that always reopened device. 2019-10-18 00:31:59 +02:00
weetmuts 7f3166e9fe Added reopenafter setting 2019-10-16 19:56:59 +02:00
weetmuts 425430f8e3 Add support for raw serial input. 2019-10-15 14:32:32 +02:00
weetmuts 17e5e33124 Added initial support for RFM-AMB meter. 2019-10-14 20:26:31 +02:00
weetmuts 55a2cac3a8 Added Lansen Temperature Hygrometer 2019-10-14 16:53:02 +02:00
weetmuts 8231a91972 Fix bug. 2019-09-16 18:42:36 +02:00
weetmuts cd4820a357 Added support for negative id match rules. 2019-09-16 16:32:24 +02:00
weetmuts 327c851c31 Apator fixes. 2019-09-06 18:38:35 +02:00
weetmuts f48b182dfb Make safe copy of Telegram for each potential meter listener. 2019-09-06 11:48:52 +02:00
weetmuts c29c67276e Added another hash for compressed multical21 telegrams. 2019-09-01 17:21:32 +02:00