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

985 Commity (260aa7cfd8b42fa4af1639dd538d63c5865c4b28)

Autor SHA1 Wiadomość Data
Fredrik Öhrström 06783609c8 Use 365.2425 for year conversions instead of 365. 2022-06-24 16:19:02 +02:00
Fredrik Öhrström 467e71ebfc Added aptor172 driver. 2022-06-24 11:07:27 +02:00
Fredrik Öhrström 536239670f Merge branch 'master' of github.com:weetmuts/wmbusmeters 2022-06-24 10:10:56 +02:00
Fredrik Öhrström cb1f628560 Add RemainingBattery vif. 2022-06-24 10:10:14 +02:00
Fredrik Öhrström 8ad9d683c4
Merge pull request #520 from larsxschneider/ls/hydrus20 
Add support for HYDRUS 2.0
 2022-06-20 20:26:32 +02:00
Fredrik Öhrström 8cf3ab1589 Add test to piigth. 2022-06-19 11:34:32 +02:00
Fredrik Öhrström 470353abea Add relative humidity extractor. 2022-06-19 11:31:28 +02:00
Fredrik Öhrström 960d5d67db Added qualcosonic driver. 2022-06-18 23:03:18 +02:00
Fredrik Öhrström 269176fe27 Allocate driver list dynamically instead of statically to avoid static initialization ordering problem when compiling with hardened flags for rpm package. 2022-06-16 16:01:31 +02:00
Fredrik Öhrström e9d2846f2e Add another mfct/type/ver combo for waterstarm. 2022-05-29 17:43:11 +02:00
Fredrik Öhrström 37a348e454 Refactor lse_07_17. 2022-05-26 21:38:07 +02:00
Fredrik Öhrström b221401aba
Merge pull request #513 from bb-froggy/debug/cuno 
Allow CMD for CUL device
 2022-05-25 20:02:04 +02:00
Fredrik Öhrström 5149e15da5 Refactor c5isf. 2022-05-25 19:45:34 +02:00
Fredrik Öhrström 6d59eb4bbe Add support for real ieee 754 floating point mbus values. 2022-05-25 16:59:55 +02:00
Fredrik Öhrström 24c487842b Add tests for ei6500. 2022-05-24 10:13:41 +02:00
Fredrik Öhrström d35be1c917 Add support for voltage. 2022-05-24 09:46:09 +02:00
Fredrik Öhrström 27c256ef42 Refactor qheat. 2022-05-23 11:28:04 +02:00
Fredrik Öhrström 6666632fe0 Add test for c5isf. 2022-05-22 23:29:01 +02:00
Fredrik Öhrström e9a267beba Refactoring ci5sf. 2022-05-22 23:24:46 +02:00
Fredrik Öhrström c0e9574228 Refactoring ci5sf. 2022-05-22 22:57:55 +02:00
Fredrik Öhrström 23b2d6fe10 Refactoring ci5sf. 2022-05-22 22:46:31 +02:00
Fredrik Öhrström 2194ae5b4f Refactoring ci5sf. 2022-05-22 22:33:04 +02:00
Fredrik Öhrström 9069910dc6 Refactoring ci5sf. 2022-05-22 22:27:13 +02:00
Fredrik Öhrström 28d49318c0 Refactoring ci5sf. 2022-05-22 22:20:55 +02:00
Fredrik Öhrström 8493de38a5 Refactor ci5sf. 2022-05-22 21:55:17 +02:00
Fredrik Öhrström 2b44d18ce4 Refactoring c5isf. 2022-05-22 21:04:00 +02:00
Fredrik Öhrström c4b79b272f Improve merging of other status fields into the main status field. 2022-05-22 16:10:16 +02:00
Fredrik Öhrström 077f375e1d Add more bits decoded in ei6500. 2022-05-22 09:50:37 +02:00
Fredrik Öhrström 7467ed97e6 Add compressed telegram example. 2022-05-21 22:19:21 +02:00
Fredrik Öhrström 28d1b6798e Add pressure meter driver kampress. 2022-05-21 22:13:40 +02:00
Fredrik Öhrström 5f42914427 Add JOIN_TPL_STATUS to waterstarm. 2022-05-21 21:51:11 +02:00
Fredrik Öhrström 5639000ffc Add mfct tpl status bits example lookup. 2022-05-21 21:21:01 +02:00
Fredrik Öhrström 5ef7122d70 Add missing driver. 2022-05-21 20:40:01 +02:00
Fredrik Öhrström b200f6292f Adjust ei6500 for proper duration tariff support. 2022-05-21 20:25:18 +02:00
Fredrik Öhrström 3208ce8199 Proper decoding of TPL status bits. 2022-05-21 14:22:56 +02:00
Fredrik Öhrström 42c84cb631 Add more includes for newer g++ compilers. 2022-05-13 16:20:55 +02:00
Fredrik Öhrström 6fdc6d2dda Add missing driver. 2022-05-07 20:00:08 +02:00
Fredrik Öhrström edba49ecbd Add error flags vif range. 2022-05-07 19:56:34 +02:00
Fredrik Öhrström ae75bf96c4 Auto-detect ascii in model-version vif. 2022-05-07 19:40:46 +02:00
Fredrik Öhrström 19ec79fc41 Add handling of combinables. 2022-05-07 19:16:34 +02:00
Fredrik Öhrström 3282c19344 Handle both types of hydroclima telegrams. 2022-05-05 21:16:03 +02:00
Fredrik Öhrström b72d83af4c Fix typo in hydroclima driver. 2022-05-05 20:45:10 +02:00
Fredrik Öhrström 94e52230b5 Added hydroclima hca. 2022-05-05 20:38:42 +02:00
Fredrik Öhrström 1932c91370 Add power to the sensostar driver. 2022-05-04 22:10:49 +02:00
Fredrik Öhrström 6debd0ab92 Converted driver sensostar. 2022-05-04 19:54:30 +02:00
Fredrik Öhrström a69310d432 Wait for response before polling next meter. 2022-05-01 20:54:12 +02:00
Fredrik Öhrström 8d164b7753 Add option pollinterval=10m to meter files. 2022-05-01 17:05:30 +02:00
Fredrik Öhrström 368fe7a823 Update cul driver EOL. 2022-04-29 08:38:09 +02:00
Fredrik Öhrström bf4ac2c0cc Add detection and warning of longer telegrams broken by bad cul firmware. 2022-04-28 16:20:30 +02:00
Fredrik Öhrström 7b586e9d8a Added --pollinterval=10m 2022-04-27 21:09:50 +02:00
Fredrik Öhrström 21f1fc113b It is now possible to set mbus as link mode for any meter. 2022-04-27 19:18:30 +02:00
Fredrik Öhrström a234cf02c6 Use wildcard for mfct/version/type when using secondary addressing for mbus. 2022-04-27 18:51:51 +02:00
Fredrik Öhrström c10d324236 Fully converted driver ultrimis driver. 2022-04-26 12:02:11 +02:00
Fredrik Öhrström fc43958b76 Add Address object. 2022-04-26 11:44:00 +02:00
Fredrik Öhrström 3a6bb0a03d Add mbus support. 2022-04-25 19:38:36 +02:00
Fredrik Öhrström 2fc9fd11d5 Full converted driver iperl. 2022-04-23 23:10:55 +02:00
Fredrik Öhrström 61b9cd1df4 Fully converted driver ultraheat and values are stored based on vname()+xuantity(). 2022-04-23 23:02:17 +02:00
Fredrik Öhrström 18466f9f2b Fully converted driver minomess. 2022-04-23 18:32:30 +02:00
Fredrik Öhrström 788436b154 Fully converted driver amiplus. 2022-04-23 18:23:04 +02:00
Fredrik Öhrström 620d420938 Full converted sharky driver. 2022-04-23 16:50:55 +02:00
Fredrik Öhrström ebae419f82 New field printing works for partially converted sharky driver. 2022-04-23 16:28:54 +02:00
Fredrik Öhrström 3e56671bfc User meter->getNumericValue instead of fi->getValueDouble. 2022-04-23 10:18:04 +02:00
Fredrik Öhrström 516ce2f8af Remove more or less unused field_name in FieldInfo. 2022-04-23 08:20:22 +02:00
Fredrik Öhrström 63ddd9f69b Add new setting of values in preparation for new meter implementations. 2022-04-22 17:28:57 +02:00
Lars Schneider a6448f7532 Add support for HYDRUS 2.0 2022-04-22 15:45:18 +02:00
Fredrik Öhrström b7be96e25b Properly handle subunit in sharky driver. 2022-04-19 09:43:10 +02:00
Fredrik Öhrström 47c9b8c653 New driver model: foreach dventry test all field info matchers. 2022-04-19 09:10:14 +02:00
Fredrik Öhrström 11763b2f22 Refactor insert offset and key inside DVEntry add extractor methods to DVEntry. 2022-04-17 17:34:51 +02:00
Fredrik Öhrström 70a7078a57 Refactor. 2022-04-17 15:54:01 +02:00
Fredrik Öhrström d768471598 Refactor. 2022-04-17 15:05:34 +02:00
Fredrik Öhrström b93d1df544 Refactor. 2022-04-17 14:57:03 +02:00
Fredrik Öhrström fc552d0566 Add easy to access ordering of telegram content. 2022-04-17 12:47:06 +02:00
Fredrik Öhrström 4abc31d75c Refactor. 2022-04-17 11:23:45 +02:00
Fredrik Öhrström 29b5efef7c Refactor. 2022-04-16 21:26:51 +02:00
Fredrik Öhrström 384d00a6bd Update DLMS manufacturers. 2022-04-16 20:31:23 +02:00
Fredrik Öhrström f058fb2501 Refactor. 2022-04-16 20:23:37 +02:00
Fredrik Öhrström 7e11dc8174 Refactor. 2022-04-16 18:15:30 +02:00
Fredrik Öhrström e01500ea30 Refactor. 2022-04-16 17:47:20 +02:00
Fredrik Öhrström cc89955004 Handle colons inside CMD(...) for a device. 2022-04-11 18:53:50 +02:00
Fredrik Öhrström bf4ac3b097 Add translate bits decimals to index, to properly decode status bits in c5isf driver. 2022-04-11 14:46:25 +02:00
Fredrik Öhrström 1feb9a2cb2 Improve c5isf driver. 2022-04-11 14:01:54 +02:00
bb-froggy c4271bc43c Allow CMD for CUL device 2022-04-09 19:51:26 +02:00
tux 84fb55f6f8 Add driver for T1A ESCO telegram for Zenner Heatmeter. They are sent out all 120sec and contain historical data of water or heat consumption 
The existing driver for T1B diagnostic telegrams has been renamed to avoid collision
 2022-04-09 08:37:52 +02:00
bb-froggy 432ffc4785 typo in error message 2022-04-02 21:09:05 +02:00
Fredrik Öhrström ade1154715 Added new driver vario451mid heat meter. 2022-03-28 21:14:47 +02:00
Fredrik Öhrström 9238d89245 Added another compact5 detection combo. 2022-03-28 20:09:59 +02:00
Fredrik Öhrström 3a357e47e2 Improve analyze information for failed decryption situations. 2022-03-28 19:15:47 +02:00
Fredrik Öhrström a2507f5ab5 Show in analyze if data is compressed and format signature is unknown. 2022-03-28 13:01:17 +02:00
Fredrik Öhrström da3231546b Add another mfct/media/version lookup for izar driver. 2022-03-28 09:12:32 +02:00
Fredrik Öhrström cd974697fb Use underline instead of hash for border between header and data, since hash does not work in urls. 2022-03-28 08:47:27 +02:00
Fredrik Öhrström b9a0823c85 When analyzing, not supplying a driver is the same as supplying auto. 2022-03-27 22:17:28 +02:00
Fredrik Öhrström e474bc686b Improve message when failed mac implies not decrypted. 2022-03-27 21:59:06 +02:00
Fredrik Öhrström fb729d5f35 Improve handling of encrypted telegrams when there is no key available. 2022-03-27 21:48:42 +02:00
Fredrik Öhrström 368230c929 Improve analyze with forced driver. 2022-03-27 14:43:10 +02:00
Fredrik Öhrström 790f78a2bf Give notification of old driver in analyze. 2022-03-27 12:09:18 +02:00
Fredrik Öhrström 97efb421d8 Add html option for analyze. 2022-03-06 22:42:44 +01:00
Fredrik Öhrström 5b8f5952b8 More iu880b work. 2022-02-19 20:37:23 +01:00
Fredrik Öhrström 39d5971fb3 Added firmware version for iu880b. 2022-02-19 19:58:19 +01:00
Fredrik Öhrström f64f927e96
Merge pull request #478 from ldebomy/master 
Update meter_izar.cc
 2022-02-19 16:57:47 +01:00
Fredrik Öhrström 808ab658d0 Update CHANGES. 2022-02-19 08:51:02 +01:00
Fredrik Öhrström 5d52eeb5d7 Add test case for negative bcd numbers. 2022-02-19 08:27:58 +01:00
Fredrik Öhrström a53816daf5
Merge pull request #480 from Germar/master 
detect negative BCD value
 2022-02-19 08:21:04 +01:00
Fredrik Öhrström d254ce5066 Add foundation for iu880b dongle to receive lora. 2022-02-19 08:13:58 +01:00
Germar Reitze d5433bd406 detect negative BCD value 2022-02-18 18:58:01 +01:00
Fredrik Öhrström 111e276376 Fix bug which caused unnecessary probing when the wmbus dongle was in fact specified. 2022-02-18 16:53:02 +01:00
Fredrik Öhrström 3468bb9ffe Can now fetch data from mbus piigth meter. 2022-02-17 19:59:51 +01:00
Fredrik Öhrström d4e367aa48 Add search for AnyEnergyVIF and refactor sharky774 driver using this feature. 2022-02-17 09:44:06 +01:00
ldebomy 5f21a71877
Update meter_izar.cc 
Serial number starts at 2
 2022-02-17 09:05:47 +01:00
Fredrik Öhrström 05b987006f Normalize copyright notices and add script for automatic extraction of copyrights. 2022-02-12 15:28:17 +01:00
Fredrik Öhrström e5b77fefa6 Add test telegram to qwater. 2022-02-10 18:05:51 +01:00
Fredrik Öhrström f89596d850 Add qwater driver and fix another bug in analyze. 2022-02-09 14:52:13 +01:00
Fredrik Öhrström 3547382184 Update CHANGES fix minor bug in analyze. 2022-02-09 14:30:06 +01:00
Fredrik Öhrström fe936f5062
Merge pull request #473 from ottmi/master 
Fix oneshot when more than one meter is defined but has not been started yet
 2022-02-09 13:02:50 +01:00
Michael Ott 0386fdd2a0 Fix oneshot when more than one meter is defined but has not been started yet 2022-02-08 21:08:48 +00:00
Fredrik Öhrström c1f3031a94 Fix bug with mode 7 encryption and some non-encrypted data at end of telegram. 2022-02-08 20:51:13 +01:00
Fredrik Öhrström da943d3573 Refactor lse_07_17 driver. 2022-02-06 21:12:05 +01:00
Fredrik Öhrström 6823279b05 Significantly improve --analyze. 2022-02-06 18:49:55 +01:00
Fredrik Öhrström cb794cae42 Improve extraction of readble strings like fabricatio no and enhanced id. 2022-02-06 11:21:15 +01:00
Fredrik Öhrström 86b7163aa1 Update CHANGES 2022-02-05 18:11:34 +01:00
Fredrik Öhrström 3252901466 It is now possible to combine --oneshot and --exitafter= with --useconfig= 2022-02-05 16:00:52 +01:00
Fredrik Öhrström ed555eafbb
Merge pull request #465 from geektoor/qheat-typofix 
Fix: fixed typo in meter_qheat.cc
 2022-02-05 08:36:37 +01:00
Fredrik Öhrström c9fd8fc059 Update CHANGES and README. 2022-02-05 08:30:47 +01:00
Fredrik Öhrström 61a8365e7c
Merge pull request #455 from klew/master 
amiplus driver: added energy parameters for tariffs 1, 2, and 3
 2022-02-05 08:19:21 +01:00
BIBO 31054a5bcc
Create driver_itron.cc 
First iteration of ITRON Water meter driver for https://github.com/weetmuts/wmbusmeters/issues/468
 2022-02-05 01:09:25 +02:00
Sven Michels 383192f9ee Fix: fixed typo in meter_qheat.cc 
While testing wmbusmeters, i noticed a small typo in my output log.
Instead of last_year_date it was printing las_year_date. This is
now fixed.
 2022-02-03 20:27:32 +01:00
Krzysztof Lewandowski 659134a0ea amiplus driver: added energy parameters for tariffs 1, 2, and 3 2022-01-28 00:50:58 +01:00
Fredrik Öhrström 70b7e51231 Fix listenvs/listfields for new driver format. 2022-01-27 11:36:26 +01:00
Fredrik Öhrström 1450c2d86a Correct minomess. 2022-01-25 22:04:18 +01:00
Fredrik Öhrström d8d0853f78 Refactor minomess. 2022-01-25 22:00:20 +01:00
Fredrik Öhrström 349524d547 Improve analyze so that it tests more relevant drivers. 2022-01-25 21:21:17 +01:00
Fredrik Öhrström c22e58f595 Add json to analyze output. 2022-01-25 20:42:46 +01:00
Fredrik Öhrström 19834d81d1 Added driver c5isf. 2022-01-25 20:10:38 +01:00
Matthias Wagner 49eb8b14bb Add more explanations to some keys of qsmoke 2022-01-22 21:41:29 +01:00
Fredrik Öhrström fda09feff4 Clean includes in drivers. 2022-01-18 11:39:42 +01:00
Fredrik Öhrström 7bf811dd67 Refactor iperl driver. 2022-01-18 11:33:55 +01:00
Fredrik Öhrström 65cc9f3846 Refactored drivers are named driver_xyz.cc This makes it easier to see how the refactoring work progresses. 2022-01-18 11:07:19 +01:00
Fredrik Öhrström 099bc33602 Refactor aventieshca. 2022-01-18 09:54:58 +01:00
Fredrik Öhrström 3ced1753d9 Add another test telegram to microclima driver. 2022-01-15 12:23:15 +01:00
Fredrik Öhrström 09bcb6e53e Add micoclima driver. 2022-01-13 15:26:44 +01:00
Fredrik Öhrström 3df46480b0 Update naming of temperature difference in wmbus table. 2022-01-13 15:17:09 +01:00
Fredrik Öhrström 6af3b53d70 Add support for Kelvin. 2022-01-13 15:06:53 +01:00
Fredrik Öhrström e3346133f8 Added microclima heat meter. 2022-01-13 11:56:26 +01:00
Fredrik Öhrström 8df2bbdf47 Refactor sharky. 2022-01-13 11:45:37 +01:00
Fredrik Öhrström b58d6cd710 Add ANYID as a synonum for '*' for the meter id. Helps when dealing with escaping. 2022-01-13 10:59:50 +01:00
Fredrik Öhrström b322838b59 Added mbus driver ultraheat. 2022-01-13 09:51:08 +01:00
Fredrik Öhrström c20a63e5b7 In logged telegrams, separate header from body with # instead of |, this makes it easier to double-click select copy and paste telegrams to the command line for decoding using wmbusmeters. 2022-01-12 19:20:03 +01:00
Fredrik Öhrström 27dd42101d
Merge pull request #441 from to-masz/add-apator-buffer-sizes 
Add missing register sizes to apator162
 2022-01-09 09:36:57 +01:00
Fredrik Öhrström 840752155e Refactor apator08. 2022-01-09 09:36:25 +01:00
Fredrik Öhrström 9c3d39710a Add default msg for no bits in bits field. 2022-01-08 22:04:18 +01:00
Fredrik Öhrström c315e6cb81
Merge pull request #442 from WagMat/master 
Fix typo in warning message
 2022-01-08 19:09:52 +01:00
Fredrik Öhrström 9356c9ad95 Refactor suprecom587 driver. 2022-01-08 18:52:06 +01:00
Matthias Wagner 2a3f501f39 Fix typo in warning message 2022-01-08 18:09:17 +01:00
Fredrik Öhrström 8168e66d6a Refactor aventieswm driver. 2022-01-08 15:50:15 +01:00
Fredrik Öhrström 75a18afd11 Add translate function. 2022-01-08 14:10:05 +01:00
Fredrik Öhrström e3e2941c32 Add new handling of meter drivers. 2022-01-08 09:58:33 +01:00
Tomasz Gramza 0562d02306
Add missing register sizes to apator162 2022-01-07 16:51:55 +00:00
DomAtHome 9bfd9914be Remove EnergyGJ 2022-01-04 09:59:51 +01:00
DomAtHome 03dcac8209 Update Sharky774 to latest changes from source repo. 2022-01-03 16:45:23 +01:00
DomAtHome 309e1bdb73
Merge pull request #2 from DomAtHome/master 
master to sharky774
 2022-01-03 16:24:33 +01:00
Fredrik Öhrström 1ba56609b5 Refactoring with the intent to make it easier to write drivers. 2022-01-02 13:08:36 +01:00
Fredrik Öhrström 5ccde88863 Add another register size for apator162. 2022-01-01 15:22:52 +01:00
Fredrik Öhrström 2fc10a03ab Added counter to lansen door/window detector. 2021-12-31 18:04:03 +01:00
Fredrik Öhrström d87663c826 Refactor by removing unnecessary c++ classes. 2021-12-31 16:47:29 +01:00
Fredrik Öhrström 40bc8bd908 Start refactoring by removing unnecessary c++ classes. 2021-12-31 12:27:57 +01:00
DomAtHome 69e8c9e2f9 Add support to Sharky 774 meter. 2021-12-29 19:46:37 +01:00
Fredrik Öhrström 9d4694d687 Fix bug where valid rtlwmbus telegrams were ignored when they came after a crc broken telegram. This bug did not tigger for the normal rtlsdr rtlwmbus usage. It triggered when piping an archive file with collected telegrams into wmbusmeters. 2021-12-29 18:53:54 +01:00
Fredrik Öhrström ff654bdfa0 Add encrypted to type info when listening to all meters. 2021-12-27 14:30:54 +01:00
Fredrik Öhrström d609d64184
Merge pull request #404 from gswdn/adddrivermetermappings 
LSE heat-cost-allocator + cold-water-meter
 2021-12-09 12:42:03 +01:00
Fredrik Öhrström b9bac60749 After analyzing and scoring the drivers decode using the selected driver. 2021-12-08 00:55:50 +01:00
Fredrik Öhrström 2ecb3e90d9 New function --analyze now works but is not yet complete. 2021-12-07 23:56:29 +01:00
Fredrik Öhrström ae6e10a291 First step to implement --analyze. 2021-12-07 19:51:26 +01:00
Fredrik Öhrström 5e8c7b93d8 Added another izar mfct/type/version combo for izars. 2021-12-07 18:30:32 +01:00
Fredrik Öhrström 3354d29354
Merge pull request #400 from DenysFrasinich/master 
Add new fields for kamstrup multical302 in mega joule
 2021-12-07 12:26:35 +01:00
Denys e92ebe3d9a Add Mj unit suport to multical 302 2021-12-06 03:02:39 +02:00
Denys 210c0e212d Revert "Add new fields for kamstrup multical302 in mega joule" 
This reverts commit 24f7ca6150.
 2021-12-06 00:05:42 +02:00
Thomas c1a1ed53c1 LSE heat-cost-allocator + cold-water-meter 
added driver mapping for Landis Staefa electronic heat-cost-allocator + cold-water-meter
 2021-12-02 19:38:31 +01:00
Denys 24f7ca6150 Add new fields for kamstrup multical302 in mega joule 2021-12-01 00:28:12 +02:00
Olli Salonen 143053b015 Add support for Zenner Minomess water meter 2021-11-30 13:17:34 +02:00
Fredrik Öhrström b56433fe27 Added another qsmoke telegram to test suite. 2021-11-28 22:07:55 +01:00
Fredrik Öhrström 7b9cde5f74 Added test for qsmoke. 2021-11-28 18:49:08 +01:00
Fredrik Öhrström 224cdb3550
Merge pull request #393 from docbobo/master 
Add Qundis watermeter 5.5 version 0x0x/0x18 to lse_07_17
 2021-11-28 18:35:42 +01:00
Fredrik Öhrström b5f3ccc152 Add parsing of variable length vifs. 2021-11-28 18:23:42 +01:00
Boris Pruessmann ddd539053d
Added new lse_07_17 variant 2021-11-28 08:46:16 +01:00
Fredrik Öhrström 67e0072cd8 Remove assert since rtlsdr dongles sometimes has an empty identifier. 2021-11-16 17:15:08 +01:00
Fredrik Öhrström 43d88def57 Revert "Honor the env in child processes" 
This reverts commit 37abbcdf88.
 2021-11-12 15:51:06 +01:00
Martin Haaß 37abbcdf88 Honor the env in child processes 
fixes #380: execvpe replaces the original env with the given array. The
array was empty effectivly removing PATH from the subshell. Thus
rtl_wmbus is not found, even if located within the PATH, as stated in
the documentation.
 2021-11-11 23:58:02 +01:00
Fredrik Öhrström f7cb6ce2ee Simulation file and hex on command line now auto-removes any valid dll-crcs found. 2021-11-08 20:12:31 +01:00
Fredrik Öhrström 02e84048f0
Merge pull request #381 from petterreinholdtsen/rtl433-error-credit 
Mention correct driver name in error message.
 2021-11-07 14:14:29 +01:00
Petter Reinholdtsen 860fb8d204 Mention correct driver name in error message. 2021-11-07 06:32:19 +01:00
Fredrik Öhrström 0224941e00 Do not accept proper non-encrypted telegrams for an id when a key is specified for that id. 2021-11-06 22:24:22 +01:00
Fredrik Öhrström d32b69a810 Do not accept non-encrypted telegrams when a key is specified. 2021-11-06 21:41:36 +01:00
Fredrik Öhrström a5694a1aab Handle a NWL 0x81 ci-field, but does not understand it... yet. 2021-11-06 20:30:09 +01:00
Fredrik Öhrström bea17e9d3d Add another register size for apator162. 2021-10-27 13:22:49 +02:00
Fredrik Öhrström 1f421834f0 Added stub for bfw240radio. 2021-10-24 17:54:36 +02:00
Fredrik Öhrström 731ae371d7 Added QHeat heat meter. 2021-10-24 17:18:53 +02:00
Fredrik Öhrström d1d9e73283 Only print total_cooling_m3 once and update test. 2021-10-18 14:53:50 +02:00
Fredrik Öhrström 6a098dffdf Fix bug in hydrocalm3 where heating volume was overwritten by cooling volume. 2021-10-18 14:48:58 +02:00
Fredrik Öhrström f2fa19551d New mapping to driver for Q module addon. 2021-10-16 21:29:10 +02:00
Fredrik Öhrström 16507dcb23 Rename unknown fields in hydrocalm3. 2021-10-16 21:09:05 +02:00
Fredrik Öhrström 72c185fff2 Correct temperature bug in hydrocalm3. 2021-10-16 21:04:10 +02:00
Fredrik Öhrström a2c3c5d666
Merge pull request #366 from jacek27/master 
Added Munia
 2021-10-16 20:26:58 +02:00
Fredrik Öhrström 678a3a8a0a Improve verbose messages when user is not member of dialout. 2021-10-16 20:20:33 +02:00
Jacek Leonhard 54a154c541 Added Munia 2021-10-16 11:41:48 +02:00
DeDragonSlayer f2576a02df amiplus and gransystsems - change NAN to 0 for nonexistent values to increase downstream compatibility 2021-10-13 09:05:27 +02:00
DeDragonSlayer 561a98da5b add phase 2 and 3 voltages 2021-10-12 10:05:26 +02:00
DeDragonSlayer 9b6638d6dc refactor voltage for phase 1 to keep naming consistent with GSS meter 2021-10-12 09:26:12 +02:00
DeDragonSlayer 0368a70fbd amiplus voltage for phase 1 2021-10-11 20:05:27 +02:00
Fredrik Öhrström a9c1066d06
Merge pull request #353 from zivillian/agin 
fix typo
 2021-10-07 12:56:08 +02:00
Fredrik Öhrström 6c34beabae Add another register size for apator162. 2021-10-06 10:19:36 +02:00
zivillian 058b7bd3c5 fix typo 2021-10-05 22:16:31 +02:00
Fredrik Öhrström d6c83f65b2 Added hydrocalm3 driver. 2021-10-02 11:36:42 +02:00
Fredrik Öhrström ebdad4eb3d Detect when option is placed after the devices on the command line. 2021-09-30 11:10:24 +02:00
Fredrik Öhrström 2c0accb6ad Do not reverse unismart version string. 2021-09-26 10:18:36 +02:00
Fredrik Öhrström 14290ba7b1 Add more fields to unismart driver. 2021-09-25 12:03:44 +02:00
Fredrik Öhrström 3e64ba587c Added test case for unismart gas meter. 2021-09-25 11:01:51 +02:00
Fredrik Öhrström 61dbc60fa7 Added UniSmart gas meter driver. 2021-09-23 12:06:12 +02:00
Fredrik Öhrström b535abe0a8 Add another register size for apator162. 2021-09-22 10:18:35 +02:00
Fredrik Öhrström 3e930d82df Add another register size for apator162. 2021-09-22 00:17:18 +02:00
Fredrik Öhrström 09bb3debf6 Improved decoding of apator162 telegrams. 2021-09-22 00:01:21 +02:00
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