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

288 Commity (master)

Autor SHA1 Wiadomość Data
Fredrik Öhrström 1093db6151 Refactor topaseskr driver to new format. 2022-11-13 17:10:18 +01:00
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 ba96a73413 Add missing simulation file. 2022-11-08 23:03:39 +01:00
Fredrik Öhrström b9f3446bc6 Fix tests. 2022-10-24 15:13:05 +02:00
Karsten ee69699a04 - added driver_engelmann-faw.cc for ENgelmann FAW Radio transmitter for 
water meters. Datasheet:  https://www.engelmann.de/wp-content/uploads/2019/11/datasheet_FAW_en_2019_06_06.pdf
- support for Engelmann Sensostar U extended. Datasheet: https://www.engelmann.de/wp-content/uploads/2021/09/datasheet_SensoStar_U_en_2021_09_23.pdf
- Test for driver_sensostar adapted in driver_sensostar.cc,
  simulation_mbus.txt and simulation_t1.txt
- Test for driver_engelmann-faw still missing in simulation_mbus.txt and
  simulation_t1.txt
 2022-10-22 12:10:50 +02:00
Fredrik Öhrström 9152e28882 Refactor q400 driver. 2022-10-12 17:55:47 +02:00
Fredrik Öhrström b95c1feacb Add formula for calculating new fields based on received fields. Refactor driver ebzwmbe. 2022-10-10 21:43:11 +02:00
Fredrik Öhrström edbf502128 Refactor driver dme_07. 2022-09-29 15:05:35 +02:00
Fredrik Öhrström 32f6987d68 Refactor driver compact5. 2022-09-29 14:46:35 +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 658263d1d4 Refactor driver apator162. 2022-09-27 22:25:13 +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 0184dfa88a Add tests for cmdline. 2022-09-21 17:48:19 +02:00
Fredrik Öhrström c0ca6793d3 Refactor driver emerlin868. 2022-09-10 19:36:08 +02:00
Fredrik Öhrström 173124c50e Refactor driver ev200. 2022-09-10 19:17:06 +02:00
Fredrik Öhrström 79e1395fdc Print OPTIONAL fields that have previously received a value, even if the field is not part of the current telegram. Merge driver whe5x into qcaloric. 2022-09-10 08:44:55 +02:00
Fredrik Öhrström 94683240ea Refactor drive whe5x. 2022-09-09 11:32:26 +02:00
Fredrik Öhrström b35abb058c Refactor driver qcaloric. 2022-09-08 21:52:26 +02:00
Fredrik Öhrström e1e8e8906a Refactor driver cma12w. 2022-09-08 20:41:58 +02:00
Fredrik Öhrström 27a77b5ec0 Refactor driver qsmoke. 2022-09-06 22:18:36 +02:00
Fredrik Öhrström 9103bb388e Refactor driver munia. 2022-09-06 20:46:55 +02:00
Fredrik Öhrström e02c985821 Refactor driver elf. 2022-09-03 22:38:08 +02:00
Fredrik Öhrström 811cd92748 Refactor driver lansenth. 2022-09-03 21:46:19 +02:00
Fredrik Öhrström 3a8bedb3de Refactor multical 603. 2022-09-03 15:58:33 +02:00
Fredrik Öhrström 84fe29069a Refactor multical21 and flowiq drivers. 2022-09-03 13:25:37 +02:00
Fredrik Öhrström 7ca0b7280c Handle meter_date and meter_datetime in minomess driver. 2022-09-02 09:53:58 +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 24c487842b Add tests for ei6500. 2022-05-24 10:13:41 +02:00
Fredrik Öhrström 27c256ef42 Refactor qheat. 2022-05-23 11:28:04 +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 b200f6292f Adjust ei6500 for proper duration tariff support. 2022-05-21 20:25:18 +02:00
Fredrik Öhrström 005a605ccb More conversions of ei6500 driver. 2022-05-21 14:58:13 +02:00
Fredrik Öhrström 3208ce8199 Proper decoding of TPL status bits. 2022-05-21 14:22:56 +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 788436b154 Fully converted driver amiplus. 2022-04-23 18:23:04 +02:00
Fredrik Öhrström 4abc31d75c Refactor. 2022-04-17 11:23:45 +02:00
Fredrik Öhrström 9238d89245 Added another compact5 detection combo. 2022-03-28 20:09:59 +02:00
Fredrik Öhrström d1db0d2e8a Update CHANGES and test case. 2022-02-19 17:15:18 +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
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 3252901466 It is now possible to combine --oneshot and --exitafter= with --useconfig= 2022-02-05 16:00:52 +01:00
Fredrik Öhrström 0582fcce9f Update test case for qheat. 2022-02-05 08:40:48 +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 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 8df2bbdf47 Refactor sharky. 2022-01-13 11:45:37 +01:00
Fredrik Öhrström c15f68b57b Add mbus test for sensostar. 2022-01-13 10:39:44 +01:00
Fredrik Öhrström b322838b59 Added mbus driver ultraheat. 2022-01-13 09:51:08 +01:00
Fredrik Öhrström e3e2941c32 Add new handling of meter drivers. 2022-01-08 09:58:33 +01:00
DomAtHome 9bfd9914be Remove EnergyGJ 2022-01-04 09:59:51 +01:00
DomAtHome 40024165bd Add tests to Sharky 774. 2022-01-04 09:06:06 +01:00
Fredrik Öhrström 4b2189ee43 Temporar fix of tests. 2022-01-01 15:17:55 +01:00
Fredrik Öhrström 2fc10a03ab Added counter to lansen door/window detector. 2021-12-31 18:04:03 +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 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 d1d9e73283 Only print total_cooling_m3 once and update test. 2021-10-18 14:53:50 +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 627b2347c2 Added regression test for munia. 2021-10-16 20:44:14 +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 d6c83f65b2 Added hydrocalm3 driver. 2021-10-02 11:36:42 +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 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 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
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