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

334 Commity (0d9d856b6a1de564eee23151d0651b15db3ad890)

Autor SHA1 Wiadomość Data
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