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

88 Commity (efbcafab9f86faff3b30eb50d322e1b528460a0d)

Autor SHA1 Wiadomość Data
Fredrik Öhrström efbcafab9f Add timestamp_utc timestamp_lt for explicit choice of date format for fields. 2021-08-08 16:50:25 +02:00
Fredrik Öhrström 08b9153167 Skip spurious bytes when testing for amb8465. 2021-06-09 12:51:37 +02:00
Fredrik Öhrström 21d3595a53 A device (mbus/wmbus/tty) can now have an alias. A meter spec can now refer to this alias. 2021-03-14 09:41:35 +01:00
Fredrik Öhrström 5eea15b18c Add meterinfo parsing that can additionally handle bus,extras and bps. 2021-03-13 18:35:47 +01:00
Fredrik Öhrström d9c73664e4 Add option --logtimestamps=<when> 2021-03-13 08:54:08 +01:00
Fredrik Öhrström 948064ae76 Add bus alias to meter info. 2021-03-09 22:00:11 +01:00
Fredrik Öhrström a53cb1f77c Refactor MeterType to MeterDriver. 2021-03-08 08:43:56 +01:00
Fredrik Öhrström dd39fe55f7 Add ppm support for rtlsdr. 2021-03-06 16:28:42 +01:00
Fredrik Öhrström 0c9fdcd81d Fix so that rtl433 works again. 2021-03-06 15:44:38 +01:00
Fredrik Öhrström 30c2926489 When looking for rtl_sdr/rtl_wmbus first look in the same dir as wmbusmeters was found. 2021-03-06 14:16:47 +01:00
Fredrik Öhrström 0467967485 Fix error in month additions/subtractions. 2021-02-27 14:28:00 +01:00
Fredrik Öhrström 7b1c8dfe7e Permit old style 64 bit keys for hydrus meters as well as izar meters. 2021-02-21 11:46:14 +01:00
Fredrik Öhrström 301c91ea68 Ignoreduplices enabled by defailt. New C++ object create for each unique meter, despite wildcards. 2021-02-20 22:21:01 +01:00
Fredrik Öhrström 6fb0bdc647 Add support to give devices an alias name. 2021-02-20 08:24:33 +01:00
Fredrik Öhrström 658f283f2e Added mbus rawtty driver. 2021-02-13 15:18:59 +01:00
Fredrik Öhrström c94ed693f2
Merge pull request #241 from don-vip/izar-address-preprocessor 
Add frame preprocessing to transform Diehl addresses
 2021-02-09 19:53:59 +01:00
Fredrik Öhrström b1fbd47f76
Merge pull request #240 from CuBiC3D/feat-add-fields 
Add known date fields to mkradio3 and tsd2
 2021-02-09 19:40:59 +01:00
Fredrik Öhrström aa3bded799 Handle new version of rtl_wmbus that returns zero instead of 2. 2021-02-09 19:26:39 +01:00
Don-vip 5d1343f121 Add frame preprocessing to transform Diehl addresses 2021-02-08 01:51:20 +01:00
Waldemar Faist 50b93b3b2c feat: add date fields to mkradio3 2021-02-07 17:35:14 +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 73c18c1831 Added evo868 water wmbus module. 2021-01-26 22:22:59 +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 781b084260 Add error message detecting missing pidfile argument to daemon. 2020-12-31 10:18:43 +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 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 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 3b86b00b96 Added --silent and test for stdin pipe close down. 2020-11-11 19:29:00 +01:00
Fredrik Öhrström 3bd42bbc70 Added sontex868 heat cost allocator. 2020-10-31 15:16:14 +01: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 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 e754cda295 Added --listmeters and --listmeters=water 2020-09-13 13:24:46 +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 570c0c5454 Now simulations work. 2020-09-08 14:55:01 +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 422793be04 Fix test. 2020-08-10 21:29:39 +02:00
Fredrik Öhrström 5038753906 Add alarm functionality. 2020-08-01 21:56:46 +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 2cc26129b4 Fix build problems. 2020-05-11 11:59:47 +02:00
Fredrik Öhrström 2c366bf6a7 Added prototype for wmbusmeters-admin. 2020-05-09 21:56:37 +02:00
Fredrik Öhrström 95e347ef39 Added setlink and getconfig. 2020-03-23 18:58:34 +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 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 126a503870 Fix bug when trimming frame A telegram which is a multiple of 18 bytes. 2020-02-16 20:58:59 +01:00
weetmuts 9700d9da1a Added fields tests for t1 meters. 2020-02-06 18:22:05 +01:00
weetmuts 7f7fb464c2 Added buffer length checks. 2020-01-31 12:44:23 +01:00
weetmuts a6c73e10db Add aescmac for more security modes. 2020-01-28 16:15:11 +01:00