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
71 Tagi
7,5 MiB
Wykres commitów

666 Commity (0296eee88184647cc0da0d3cc2f2befafa929347)

Autor SHA1 Wiadomość Data
Fredrik Öhrström fc89b34015 Added another mfct/version/media combo for the izar driver. 2021-09-20 10:54:53 +02:00
Fredrik Öhrström 0788ad7b90 Added :hex type for stdin, files and ttys. 2021-09-12 19:51:33 +02:00
Fredrik Öhrström 89cf1bad80 Parse and decode a hex string supplied as argument on command line. 2021-09-12 10:40:40 +02:00
Fredrik Öhrström 2baff2207b Correct off by one error. 2021-09-02 20:37:51 +02:00
Fredrik Öhrström b5f89eb61d Add ability to send bytes to a bus. 2021-08-29 20:26:06 +02:00
Fredrik Öhrström 2739938424 Fix memleak in testinternals. 2021-08-27 08:50:46 +02:00
Fredrik Öhrström 301f7bd3f7 Add option --listunits 2021-08-27 08:31:56 +02:00
Tomasz Gramza 62c8ffc34f
Unify meter configuration parsing between command line and configuration file 2021-08-26 20:02:45 +00:00
Fredrik Öhrström 4c1c677486 Added handling of out of bounds offset. 2021-08-21 21:45:43 +02:00
Fredrik Öhrström b346841a7e Add necessary header file for alpine linux docker builds. 2021-08-21 21:11:50 +02:00
Fredrik Öhrström bc522feef7
Merge pull request #328 from to-masz/apator162-custom-offset 
Add possibility to explicitly point meter reading offset in apator162 telegram
 2021-08-21 20:58:36 +02:00
Tomasz Gramza d006f2ef91
Test extras offset in apator162 2021-08-21 16:03:17 +00:00
Tomasz Gramza 70476b1027
Accept offset form extras meterinfo in apator162 2021-08-21 16:02:12 +00:00
Fredrik Öhrström 3c79af043a Add extra clearing of serial buffer when detecting amb8465. 2021-08-19 16:04:29 +02:00
Fredrik Öhrström f0677c2587 Improve testing code coverage. 2021-08-19 12:54:04 +02:00
Fredrik Öhrström 8dd3e87c44
Merge pull request #324 from dwrobel/dw-fix-snprintf 
Fix snprintf format argument
 2021-08-13 10:11:29 +02:00
Fredrik Öhrström 1f2a078567 Add ifndef FUZZING to util.h. Add wmbusmeters.g which include debug symbol, but not include full libasan address sanitizer code. 2021-08-13 10:09:20 +02:00
Damian Wrobel f6659accbb Fix snprintf format argument 
Fixes the following compilation error:

src/meters.cc: In member function
  'virtual std::string MeterCommonImplementation::unixTimestampOfUpdate()':
src/meters.cc:407:35: warning: format '%zu' expects argument of type 'size_t',
  but argument 4 has type 'time_t' {aka 'long int'} [-Wformat=]
  407 |     snprintf(ut, sizeof(ut)-1, "%zu", datetime_of_update_);
      |                                 ~~^   ~~~~~~~~~~~~~~~~~~~
      |                                   |   |
      |                                   |   time_t {aka long int}
      |                                   unsigned int
      |                                 %lu
RPM build errors:
error: Bad exit status from /var/tmp/rpm-tmp.9tme28 (%build)
    Bad exit status from /var/tmp/rpm-tmp.9tme28 (%build)
Child return code was: 1
 2021-08-12 19:36:26 +02:00
Fredrik Öhrström c0c61575be Add check of length for buffer when potentially decrypting aes blocks. 2021-08-09 12:00:55 +02:00
Fredrik Öhrström 838f89d576 When fuzzing do not check crcs. This can make the fuzzer reach more code paths. 2021-08-09 11:06:30 +02:00
Fredrik Öhrström 5793d7f5b7 Previous commit added better detection of amb8465 dongles. This commit removes unnecessary assert for length inside crc calculation. This check caused unnecessary fuzz crashes. 2021-08-09 01:10:13 +02:00
Fredrik Öhrström 837b86da85 Fix bug that caused crash when dongle was reset. 2021-08-09 00:10:38 +02:00
Fredrik Öhrström 0d830bad59 Fix bug that caused crash when dongle was reset. 2021-08-08 23:07:34 +02:00
Fredrik Öhrström c490c92fdf Add debug information to amb8465 detection. 2021-08-08 21:36:32 +02:00
Fredrik Öhrström 8df796017e Added izar rs 868 meter detection. 2021-08-08 20:06:31 +02:00
Fredrik Öhrström bbe12e517b Added Axioma W1 water meter. 2021-08-08 18:31:36 +02:00
Fredrik Öhrström 0f209edc97 Update README, CHANGES and man page. 2021-08-08 17:16:52 +02:00
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 6009382d4f Rename jsons to extra_constant_fields. 2021-08-02 00:22:13 +02:00
Fredrik Öhrström e4d3ec1e7e Add field_ prefix which is equivalent to json_ prefix. 2021-08-01 23:12:52 +02:00
Fredrik Öhrström 2c83c51db1 Add field timestamp_ut for printing unix timestamp millis. 2021-08-01 18:24:19 +02:00
BIBOLV a8dfb74720 Add version 0x06 for bmeter water meter. 
Fix for https://github.com/weetmuts/wmbusmeters/issues/308
 2021-07-09 00:58:37 +03:00
the78mole 826404ef17 Added Aventies HCA meter 2021-07-05 21:19:45 +02:00
Fredrik Öhrström cf9a22a7e2 Add version 0x34 for qcaloric hca meters. 2021-07-04 10:52:20 +02:00
the78mole 47b15021ce Added aventies water meter 2021-07-02 15:56:32 +02:00
Fredrik Öhrström 8b258304ee Add script to collect copyrights for deb creation. 2021-06-26 16:30:24 +02:00
Fredrik Öhrström e93310e008 Sync man with readme with code. 2021-06-26 12:24:30 +02:00
Fredrik Öhrström 08b9153167 Skip spurious bytes when testing for amb8465. 2021-06-09 12:51:37 +02:00
Björn Adler 2d57b3ef44 Add Qundis 5.5 watermeter version 16 to lse_07_17 driver 2021-05-30 17:40:58 +02:00
Fredrik Öhrström d00469c42f Handle latest firmware version 15 for im871a. 2021-04-13 13:18:53 +02:00
mblnk 11c4383d8f Adapt error code output string to "OK" or "ERR 0b43" 2021-04-13 11:48:14 +02:00
mblnk 397bd7d3d8 Rename qwater55 to lse_07_17 2021-04-13 11:00:57 +02:00
mblnk 403017f640 Add stuff for QWater5.5 2021-04-12 20:21:50 +02:00
Fredrik Öhrström f753449750 Added water meter Diehl IZAR RC I G4. 2021-04-10 17:58:32 +02:00
Fredrik Öhrström a26bac3932 Added detection of im871a firmware and support c1+t1 mode. 2021-03-18 22:44:50 +01:00
Fredrik Öhrström ecc9e7f5a4 Add first step to get mbus parsing working. 2021-03-14 12:15:49 +01: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 d66cfeebc3 Update CHANGES. 2021-03-13 10:28:58 +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 71c32c7852 Create bus manager. 2021-03-08 17:14:03 +01:00
Fredrik Öhrström a53cb1f77c Refactor MeterType to MeterDriver. 2021-03-08 08:43:56 +01:00
Fredrik Öhrström a74c36da15 Update README/CHANGES about new auto driver. 2021-03-07 20:40:41 +01:00
Fredrik Öhrström 4169574f4a Moved detection mapping into separate file. 2021-03-07 20:10:44 +01:00
Fredrik Öhrström bb259239e9 Add auto driver to auto-select meter driver. 2021-03-07 19:52:21 +01:00
Fredrik Öhrström 61cd47db49 Add driver lse_08 for HCA meters from Qundis Siemens. 2021-03-07 18:52:36 +01:00
Fredrik Öhrström c90ca18b1b Added techem/wehrle water meter combo. 2021-03-07 14:39:52 +01:00
Fredrik Öhrström 365b38a535 Fix S1 in rtlwmbus driver. 2021-03-06 23:05:17 +01:00
Fredrik Öhrström dd39fe55f7 Add ppm support for rtlsdr. 2021-03-06 16:28:42 +01:00
Fredrik Öhrström 76c6b6faa9 Adjust tests. 2021-03-06 16:03:38 +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 408cc19485 Add support for extra parameters to wmbus device. 2021-03-06 09:45:31 +01:00
Fredrik Öhrström 36ca71d353 Added smoke meter ei6500. 2021-03-06 07:42:37 +01:00
Fredrik Öhrström 0467967485 Fix error in month additions/subtractions. 2021-02-27 14:28:00 +01:00
Fredrik Öhrström 4ae4010d56 Add METER_DEVICE, METER_RSSI_DBM and METER_MEDIA to shell envs. 2021-02-24 20:50:45 +01:00
Fredrik Öhrström dbf3dadc4c Work on mbus support. 2021-02-24 20:20:04 +01:00
Fredrik Öhrström 7c928ec2f3 Add support for checking plain MBUS frames. 2021-02-21 12:58:31 +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 73c4085a00 Move createMeter into meters.cc 2021-02-20 11:08:23 +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 05d52e0a86 Initialize actuality_duration. 2021-02-15 08:11:42 +01:00
Fredrik Öhrström 9d8f8e8e5c
Merge pull request #251 from don-vip/fix-izar-manufacturer-year 
Fix IZAR manufacture year parsing
 2021-02-15 07:40:02 +01:00
Don-vip 3e28dbc17f Fix IZAR manufacture year parsing 2021-02-15 02:21:15 +01:00
Don-vip 151c0f4057 Improve Hydrus support 2021-02-15 01:50:49 +01:00
Fredrik Öhrström 51185e931b Added Apator Elf Heat meter. 2021-02-14 22:55:25 +01:00
Don-vip a9ad2d0256 Add manufacture year and serial number for SAP PRIOS devices 2021-02-13 21:51:11 +01:00
Fredrik Öhrström dd456ea620 Fix bug in IV calculation for telegrams with tpl-id and AES CBC IV. 2021-02-13 21:40:05 +01:00
Fredrik Öhrström b53adbf5b7 Added parity setting to serials. 2021-02-13 15:58:38 +01:00
Fredrik Öhrström 658f283f2e Added mbus rawtty driver. 2021-02-13 15:18:59 +01:00
Don-vip 66dfea1b58 Add Sharky 775 + fix Diehl address swapping 2021-02-13 03:22:08 +01:00
Fredrik Öhrström bb5dae27a0 Add info on third extension code marker. 2021-02-12 16:46:40 +01:00
Fredrik Öhrström 83c29d900c
Merge pull request #243 from don-vip/izar-more-fields 
Decode IZAR transmit period
 2021-02-09 20:08:16 +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 8e984a107e Decode IZAR transmit period 2021-02-08 21:18:44 +01:00
Don-vip 5d1343f121 Add frame preprocessing to transform Diehl addresses 2021-02-08 01:51:20 +01:00
Waldemar Faist 3b34e1cf71 style: new line 2021-02-07 19:23:32 +01:00
Waldemar Faist 3e430711a3 feat: add date fields to tsd2 2021-02-07 18:52:46 +01:00
Waldemar Faist 50b93b3b2c feat: add date fields to mkradio3 2021-02-07 17:35:14 +01:00
Fredrik Öhrström daab1b303e
Merge pull request #237 from CuBiC3D/fix-tch-dataiii 
Fix parsing for Techem HCA with version 0x94
 2021-02-07 11:19:03 +01:00
Fredrik Öhrström 3ed662c07c Added tpl ci A3h which probably means manufacturer specific. 2021-02-07 08:02:56 +01:00
Fredrik Öhrström be9bc54da5 Remove unnecessary comments. 2021-02-07 07:53:19 +01:00
Waldemar Faist a78aaec991 fix: correct offsets for techem hca 2021-02-06 18:29:47 +01:00
Fredrik Öhrström cc49118cc9
Merge pull request #232 from CuBiC3D/feat-cul-rssi 
Support RSSI on CUL
 2021-02-06 07:15:24 +01:00
Waldemar Faist 5dde4868c7 feat: support RSSI on CUL 2021-02-05 15:31:01 +01:00
Vincent Privat 0fe2f5403a
Fix IZAR previous_alarms description 2021-02-04 21:58:11 +01:00
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