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

333 Commity (master)

Autor SHA1 Wiadomość Data
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
Fredrik Öhrström 797d9c3bdc Added log timestamps test. 2021-03-13 09:08:17 +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 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 76c6b6faa9 Adjust tests. 2021-03-06 16:03:38 +01:00
Fredrik Öhrström f953b9c2c9 Add tests. 2021-03-06 07:53:48 +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 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 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 66dfea1b58 Add Sharky 775 + fix Diehl address swapping 2021-02-13 03:22:08 +01:00
Don-vip 5d1343f121 Add frame preprocessing to transform Diehl addresses 2021-02-08 01:51:20 +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 14742c713e Add regression test for yet another weird izar. 2021-02-07 08:27:01 +01:00
Waldemar Faist 65b11a6a1d test: added for techem hca 0x94 2021-02-06 21:05:16 +01:00
Fredrik Öhrström 39f553322a Add test files. 2021-01-30 18:17:25 +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 2a6ba20cbe Include regressions tests for gransystem. 2021-01-30 08:52:25 +01:00
Fredrik Öhrström 73c18c1831 Added evo868 water wmbus module. 2021-01-26 22:22:59 +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 b243686ad6 Fix multical 803 to expect Joule and not KWh in telegram. 2021-01-24 20:06:21 +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 5b29b9de4a Added regression test for compact5 heat meter. 2021-01-24 11:18:54 +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 a6f3e31971 Add missing file. 2021-01-06 13:28:56 +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 2616f64cb7 Fix for omnipower provided by janusboandersen. 2020-12-28 17:47:21 +01:00
Fredrik Öhrström 14ad435d02 Added support for multical803. 2020-12-05 12:01:33 +01:00
Erwan Martin 8e72fb10e0 Rewrite for loop so that it doesn't use any bash idioms. 2020-11-29 14:33:06 +01:00
Erwan Martin 3463fb4df6 Use sh instead of bash to support systems without bash. 2020-11-29 12:27:08 +01:00
Fredrik Öhrström 1e94a81183 Added type/ver for yet another moronic Izar meter that reports itself as a electric breaker.... 2020-11-25 11:34:14 +01:00
Fredrik Öhrström efd9aaa786 Updates CHANGES and fix test. 2020-11-25 11:01:27 +01:00
Fredrik Öhrström 3735c9fa70 Added ev200 and emerlin868. 2020-11-14 10:48:49 +01:00
Fredrik Öhrström e83dc5b248 Add missing files. 2020-11-12 01:01:22 +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 0320070c41 Added regression test for Sensostar 2 heat meter. 2020-11-10 16:49:47 +01:00
Fredrik Öhrström a33a9fb129 Added test for ultrimis. 2020-11-03 18:15:51 +01:00
Fredrik Öhrström 5e273ddb7e Added donotprobe=<device> and fixed so that it does not probe if a device is specified or rtlwmbus is specified. 2020-11-01 15:18:13 +01:00
Fredrik Öhrström 3bd42bbc70 Added sontex868 heat cost allocator. 2020-10-31 15:16:14 +01:00
Fredrik Öhrström ea530a7531 Added --ignoreduplicates 2020-10-25 20:57:25 +01:00
Fredrik Öhrström 097301c8b4 Add support for flowiq2200 meter. 2020-10-25 19:48:07 +01:00
Fredrik Öhrström 4cbf1a4b27 Decode two vendor values in multical603 as energy forward and returned. 2020-10-25 18:54:03 +01:00
Fredrik Öhrström 88d655e66a Accept t1 and c1 as linkmodes for multical21 meters. 2020-10-25 18:26:21 +01:00
Fredrik Öhrström c16409c28a List fields improvement. 2020-10-24 22:20:55 +02:00
Fredrik Öhrström c4226a8268 Added device and rssi_dbm to json. 2020-10-14 20:59:14 +02: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 69af4f462f Add errno.h for macosx build. 2020-09-27 11:44:24 +02:00
Fredrik Öhrström 701c6041ac Added support for new version of Hydrus meter. 2020-09-27 11:01:36 +02:00
Fredrik Öhrström d443fd4ea2 Add partial support for RC1180. 2020-09-26 13:52:24 +02:00
Fredrik Öhrström 8568437635 Partially removed reopenafter. 2020-09-25 22:27:34 +02:00
Fredrik Öhrström 5ac2bdd37a Now properly reads all data from child-process that has exited. 2020-09-25 17:34:47 +02:00
Fredrik Öhrström 1578cb9838 Log more at alarm test. 2020-09-18 21:48:47 +02:00
Fredrik Öhrström 94790e7be6 Debug test 2020-09-18 21:30:52 +02:00
Fredrik Öhrström 891e3f4228 Alarm test work again. 2020-09-18 20:05:59 +02:00
Fredrik Öhrström 802e62cbbd Now logging defaults to stderr. 2020-09-13 16:55:22 +02:00
Fredrik Öhrström c1d6d36a6d Improved --listfields=<meter_type> 2020-09-08 22:22:30 +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 c12a0e8e19 Most tests pass. 2020-09-08 20:50:51 +02:00
Fredrik Öhrström a048982f8b With debug enable, printELL and printTPL even if decryption failed. 2020-09-04 14:03:25 +02:00
Fredrik Öhrström c48ad8e368 Added driver detection from telegrams. 2020-09-04 11:31:49 +02:00
Fredrik Öhrström ecce6a2c08 Added test case and updated README. 2020-09-02 13:17:52 +02:00
eborned d532f10418 Added tests for Multical403 in cooling configuration. 2020-08-18 18:52:47 +02:00
Fredrik Öhrström b11b097041 Merge branch 'master' into AddAlarm 2020-08-10 23:37:39 +02:00
Fredrik Öhrström 7e6c57ad48 Added support for rtl_433 to decode wmbus radio signals. 2020-08-10 23:00:41 +02:00
Fredrik Öhrström 422793be04 Fix test. 2020-08-10 21:29:39 +02:00
Fredrik Öhrström 0843b19379 Adjust alarm type. 2020-08-01 22:24:23 +02:00
Fredrik Öhrström 5038753906 Add alarm functionality. 2020-08-01 21:56:46 +02:00
Fredrik Öhrström c12d0995b6 Support Waterstar M meter. 2020-07-30 12:19:54 +02:00
Fredrik Öhrström d8c68f94bc Added support for lansen pulse counter. 2020-06-30 16:02:38 +02:00
Fredrik Öhrström 3a7931fd07 Added support for lansen door/window sensor. 2020-06-30 11:29:55 +02:00
Fredrik Öhrström 310406fddd Added support for Lansen Smoke detector. 2020-06-22 10:44:47 +02:00
Fredrik Öhrström 2338ff6259 Update test cases. 2020-05-30 09:51:25 +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 20bc6c6a02 Add --selectfields=... 2020-05-09 23:46:07 +02:00
Fredrik Öhrström 36e213e49a Support comments (lines starting with #) in the conf and meter files. 2020-05-06 09:41:29 +02:00
Fredrik Öhrström 3edd661667 Add heuristic to apator162 decoding. 2020-04-30 09:15:01 +02:00
Fredrik Öhrström 5aacdfecf3 Fix test of fields for t1 meters. 2020-04-26 15:08:24 +02:00
Fredrik Öhrström 470c2f6e75 Change echo to printf to deal with MacOSX default shell. 2020-04-22 08:23:21 +02:00
Fredrik Öhrström 9d80f5c212 Fix test. 2020-04-22 08:10:28 +02:00
Fredrik Öhrström c62e90812b Adjust == to = in tests. 2020-04-22 08:07:19 +02:00
Erwan Martin db4fe082e8 Use /bin/sh instead of /bin/bash to support systems that do not have bash. 2020-04-21 12:40:25 +02:00
weetmuts 33952d803f Added divide by 3 to apator08. 2020-02-23 18:41:21 +01:00
weetmuts f1da5b48ee Add missing test. 2020-02-18 07:48:24 +01:00
weetmuts edd523a64b Added more guessing for the apator162. 2020-02-18 07:41:31 +01:00
weetmuts baa88b8270 Added 0x84 to apator162 guessing. 2020-02-17 19:10:35 +01:00
weetmuts 2f2f4a1e58 Small fixes. 2020-02-12 07:52:29 +01:00
weetmuts a1d21a09b4 Improved README. 2020-02-06 19:06:53 +01:00
weetmuts 9700d9da1a Added fields tests for t1 meters. 2020-02-06 18:22:05 +01:00
weetmuts 07ccc1cea5 Add test for esyswm. 2020-02-06 18:22:05 +01:00
weetmuts 884aed37ba Add eBZ wmbus meter. 2020-02-06 13:14:46 +01:00
weetmuts 590a94e870 Added another offset to apator162. 2020-02-04 07:44:49 +01:00
weetmuts 9ed8a40469 Updated test. 2020-02-03 18:50:31 +01:00
weetmuts b677bc4021 Updated izar. 2020-02-02 21:31:46 +01:00
weetmuts 35ab71bf0d Added Q400 water meter and CMa12w room sensor. 2020-01-27 16:53:18 +01:00
weetmuts 4c27f6c11c Refactor parsing. 2020-01-27 09:29:40 +01:00
weetmuts 468ba75267 Added testing of aes decryption. 2020-01-23 12:59:22 +01:00
weetmuts 4cf462b9b9 Refactoring parser. 2020-01-20 20:41:33 +01:00
weetmuts 315e216efc Added support for cmdline override of config file for device and listento. 2020-01-19 17:55:46 +01:00
weetmuts 389b72cbfb Added yet another apator162 offset. 2019-12-28 10:33:18 +01:00
weetmuts cf7efb8127 Added support for meterfilestimestamp 2019-12-11 18:56:34 +01:00
weetmuts bf233da26c Added support for Hydrodigit water meter. 2019-12-07 14:46:28 +01:00
weetmuts b39080f10f Correctly supported Multical302 meter. 2019-11-26 16:12:32 +01:00
weetmuts 78d7eb55da Added support for Hydrus meter. 2019-11-26 14:24:17 +01:00
weetmuts 9035da7adc Fix failing test. 2019-11-21 14:59:57 +01:00
weetmuts ed47714854 Update CHANGES 2019-11-10 08:09:21 +01:00
Fredrik Öhrström 260e53e046
Merge pull request #42 from skazi0/izar 
Diehl/Sappel IZAR Water meter support
 2019-11-10 08:02:22 +01:00
weetmuts d3e221ffbf Updated README 2019-11-03 23:43:29 +01:00
weetmuts cae1144283 Improved testing. 2019-11-03 22:00:18 +01:00
weetmuts 28d5495882 Added support for stdin and file.\n 2019-11-03 16:31:30 +01:00
Jacek Tomasiak 302b08a478 Add Izar water meter support 2019-10-29 21:48:36 +01:00
weetmuts 7876804a0b Add recovery when rawtty gets out of sync. 2019-10-28 22:10:29 +01:00
weetmuts 30543f6217 Added support for additional static json info. 2019-10-20 19:19:17 +02:00
weetmuts 7f3166e9fe Added reopenafter setting 2019-10-16 19:56:59 +02:00
weetmuts 17e5e33124 Added initial support for RFM-AMB meter. 2019-10-14 20:26:31 +02:00
weetmuts 55a2cac3a8 Added Lansen Temperature Hygrometer 2019-10-14 16:53:02 +02:00
weetmuts 8231a91972 Fix bug. 2019-09-16 18:42:36 +02:00
weetmuts cd4820a357 Added support for negative id match rules. 2019-09-16 16:32:24 +02:00
weetmuts 04be63eb12 Add test for apator162 with offset 22 2019-09-07 11:19:45 +02:00
weetmuts 475bff43c8 Added experimental apator162 detection of where the offset of total consumption is located. 2019-08-12 11:47:39 +02:00
weetmuts 6d6e1b5d93 Added meterfilesnaming 2019-06-20 14:28:52 +02:00
weetmuts 5559052799 Added support for id=8765* matching. 2019-06-06 18:16:24 +02:00
weetmuts ff32981c13 Added support for meters that might transmit using different link modes. 2019-06-06 17:28:20 +02:00
weetmuts d113927af0 Add missing test file. 2019-05-21 19:29:51 +02:00
weetmuts 500689a12f Added support for EurisII heat cost allocator. 2019-05-21 15:18:06 +02:00
weetmuts 250f696015 Add missing file. 2019-05-04 23:00:59 +02:00
weetmuts ffae9c91f3 Added tests for addconversions 2019-05-04 22:39:45 +02:00
weetmuts 62c8e167c2 Converted all meters to new standard. 2019-05-04 20:52:05 +02:00
weetmuts 787ecae509 Rewired vario heatmeter to kwh. 2019-05-04 08:52:25 +02:00
weetmuts cb0c6a5a54 Added inital support for meter MK Radio 3. 2019-04-27 13:31:13 +02:00
weetmuts 6d7c88f4ab Added improved verbose message for received telegrams with failed crc checks. 2019-04-13 23:59:33 +02:00
weetmuts 01642e931f Improved serial command logging to print readable text. 2019-04-04 18:18:27 +02:00
weetmuts ebe9a30583 Added test for multiple elements. 2019-04-04 08:36:22 +02:00
weetmuts 2b13e884b7 Added more device/media types. 2019-04-02 18:57:37 +02:00
weetmuts bf5941ef42 Fetched list of manufacturers from dlms.com 2019-04-01 23:22:09 +02:00
weetmuts baff135418 Almost complete decoding of amiplus meter. 2019-03-20 22:16:45 +01:00
weetmuts 7394aa7175 Added fuzzying of dvparser. 2019-03-15 21:49:18 +01:00
weetmuts 093f7bb792 Added max_flow_m3h to iperl meter. 2019-03-12 20:05:05 +01:00
weetmuts 2d342a4d7e Added test for non-encrypted iperl. 2019-03-11 17:31:34 +01:00
weetmuts 7e72fe0f3f Added support for multiple comma separated ids. 2019-03-05 21:19:05 +01:00
weetmuts f399686b8b Added working parse of qcaloric. 2019-02-28 19:38:43 +01:00
weetmuts 4574bff236 Added missing file 2019-02-28 17:30:29 +01:00
weetmuts 08cdf9825e Improve manual 2019-02-27 19:42:21 +01:00
weetmuts 58e89749d3 Updated command line options and added man page 2019-02-26 22:19:16 +01:00
weetmuts b4092bcdff Updated README and small fixes. 2019-02-26 09:33:10 +01:00
weetmuts dfe8c8bee5 More tests. 2019-02-24 17:31:32 +01:00
weetmuts be8bdf7e55 Daemon now stops if the dongle is unplugged. 2019-02-24 16:51:18 +01:00
weetmuts b6d89334b7 Added logfile support. 2019-02-24 15:20:55 +01:00
weetmuts b68cadfdc8 More work on running as daemon. 2019-02-23 23:11:09 +01:00
weetmuts ff06425bf9 Tests for config files. 2019-02-23 21:21:17 +01:00
weetmuts 69cf31ace0 Source cleanup. 2019-02-23 18:30:16 +01:00