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

310 Commity (92090073cb8ec158d15705e868e6a0edc7a5ec16)

Autor SHA1 Wiadomość Data
Fredrik Öhrström 5675716286 Change nan:s to null:s in fields. Fix problem with irrelevant fields listed for --listfields for some meters. Refactor unismart driver. 2022-11-12 16:30:10 +01:00
Fredrik Öhrström fadce1cb60 Refactor esyswm to new driver format. 2022-11-11 12:24:00 +01:00
Fredrik Öhrström 19263bcb46 Refactor ehzp and fix on_time_h bug. 2022-11-10 22:07:57 +01:00
Fredrik Öhrström 43051654e0 Add missing config files for test. 2022-11-08 23:02:37 +01:00
Fredrik Öhrström 34469fc34e Add calculated fields in conf and meter file. 2022-11-08 22:55:53 +01:00
Fredrik Öhrström ab23cc4212 Test formulas. 2022-11-08 22:55:53 +01:00
Fredrik Öhrström 9152e28882 Refactor q400 driver. 2022-10-12 17:55:47 +02:00
Fredrik Öhrström 30b33c9ede Make sure field matching is performed on the dv entries in an order where the offsets are increasing. 2022-09-28 13:48:17 +02:00
Fredrik Öhrström 84eeaaa038 Dif 0f is manufacturer specific, treat remaining odd difs, like 7f also as manufacturer specific. 2022-09-27 19:27:37 +02:00
Fredrik Öhrström 0643668f51 Handle broken telegram where multiple dventries match the same field. 2022-09-27 17:27:20 +02:00
Fredrik Öhrström f5f4e83505 Add missing config. 2022-09-21 18:19:54 +02:00
Fredrik Öhrström 0184dfa88a Add tests for cmdline. 2022-09-21 17:48:19 +02:00
Fredrik Öhrström 2ce3f33151 Rename --device= to --overridedevice= 2022-09-21 16:49:51 +02:00
Fredrik Öhrström b35abb058c Refactor driver qcaloric. 2022-09-08 21:52:26 +02:00
Christian Speich 445aca6227 Keep environment in shell subprocesses 
Currently we replace the environment of subprocesses with our own,
primarily only consisting of METER_* entries. Besides clearing
some very useful system dependent variables (like PATH, LDPATH, etc.)
with also prevent the user from passing environment variables to
invoked commands.

This patch will now copy the current environment and extends it with
the variables we want to set.

Signed-off-by: Christian Speich <christian@spei.ch>
 2022-09-04 10:20:11 +02:00
Fredrik Öhrström 811cd92748 Refactor driver lansenth. 2022-09-03 21:46:19 +02:00
Fredrik Öhrström 84fe29069a Refactor multical21 and flowiq drivers. 2022-09-03 13:25:37 +02:00
Fredrik Öhrström 8e5c7f756d Refactor lansensm into new driver format. 2022-09-02 08:51:29 +02:00
Fredrik Öhrström e0e79c0631 Refactor lansen pu driver. 2022-09-01 23:55:51 +02:00
Fredrik Öhrström 470353abea Add relative humidity extractor. 2022-06-19 11:31:28 +02:00
Fredrik Öhrström b200f6292f Adjust ei6500 for proper duration tariff support. 2022-05-21 20:25:18 +02:00
Fredrik Öhrström ae75bf96c4 Auto-detect ascii in model-version vif. 2022-05-07 19:40:46 +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 1feb9a2cb2 Improve c5isf driver. 2022-04-11 14:01:54 +02:00
Fredrik Öhrström 869123d1f1 Improve test of hex input. 2022-04-09 08:32:42 +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 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 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 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 0296eee881 Adjust test to server stdin being closed. 2022-02-05 17:47:41 +01:00
Fredrik Öhrström 8f12d0a5f8 Adjust exitafter test timing. 2022-02-05 17:39:55 +01:00
Fredrik Öhrström 9c0b53551b Add missing config files for test. 2022-02-05 17:34:10 +01:00
Fredrik Öhrström 3b1a0127b0 Adjust test for server build. 2022-02-05 16:22:42 +01:00
Fredrik Öhrström 29c7177e8c Update test to run on build server. 2022-02-05 16:09:39 +01:00
Fredrik Öhrström 008fcf9ce7 Add test file. 2022-02-05 16:01:07 +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 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
Fredrik Öhrström f04434f505 Add new test case for configurable electricity meters. 2022-02-03 15:40:59 +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 7bf811dd67 Refactor iperl driver. 2022-01-18 11:33:55 +01:00
Fredrik Öhrström 3ced1753d9 Add another test telegram to microclima driver. 2022-01-15 12:23:15 +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 c15f68b57b Add mbus test for sensostar. 2022-01-13 10:39:44 +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 9356c9ad95 Refactor suprecom587 driver. 2022-01-08 18:52:06 +01:00
Fredrik Öhrström 8168e66d6a Refactor aventieswm driver. 2022-01-08 15:50:15 +01:00
Fredrik Öhrström e3e2941c32 Add new handling of meter drivers. 2022-01-08 09:58:33 +01:00
Fredrik Öhrström 362630d7e4 Update test. 2022-01-04 13:27:22 +01:00
DomAtHome 40024165bd Add tests to Sharky 774. 2022-01-04 09:06:06 +01:00
Fredrik Öhrström 2fc10a03ab Added counter to lansen door/window detector. 2021-12-31 18:04:03 +01:00
Fredrik Öhrström 40bc8bd908 Start refactoring by removing unnecessary c++ classes. 2021-12-31 12:27:57 +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 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 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
Olli Salonen 0627416f1a Add tests for Zenner Minomess 2021-12-01 22:31:21 +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 88b2386311 Added test yet another q water 5.5 2021-11-28 18:45:28 +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 38e4f7fb35 Added multical602 meter. 2021-11-06 23:13:39 +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 731ae371d7 Added QHeat heat meter. 2021-10-24 17:18:53 +02:00
Fredrik Öhrström 627b2347c2 Added regression test for munia. 2021-10-16 20:44:14 +02:00
Fredrik Öhrström 7b57905cdf Add test. 2021-10-12 15:15:14 +02:00
DeDragonSlayer 561a98da5b add phase 2 and 3 voltages 2021-10-12 10:05:26 +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 3e64ba587c Added test case for unismart gas meter. 2021-09-25 11:01:51 +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 de91a30853 Time start of test to avoid spurious errors due to second flip. 2021-08-27 11:22:08 +02:00
Fredrik Öhrström 718cb8fe1b Added test for meter extras in config file. 2021-08-27 08:45:37 +02:00
Fredrik Öhrström 4c1c677486 Added handling of out of bounds offset. 2021-08-21 21:45:43 +02:00
Tomasz Gramza d006f2ef91
Test extras offset in apator162 2021-08-21 16:03:17 +00: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 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 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
Fredrik Öhrström e31f1d005f Add telegram to listen to all test. 2021-07-10 21:08:38 +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
Fredrik Öhrström cf9a22a7e2 Add version 0x34 for qcaloric hca meters. 2021-07-04 10:52:20 +02:00
Fredrik Öhrström 84f4d6892d Added regression tests for aventies water meter. 2021-07-02 19:35:45 +02:00
Fredrik Öhrström 59b7421b5b Added another telegram for testing of Qundis meter. 2021-06-04 10:07:38 +02:00
Fredrik Öhrström 78ed2b5f13 Add test for QWater5.5 and update README/CHANGES. 2021-04-13 12:05:59 +02:00
Fredrik Öhrström f753449750 Added water meter Diehl IZAR RC I G4. 2021-04-10 17:58:32 +02:00