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 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
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 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 f953b9c2c9 Add tests. 2021-03-06 07:53:48 +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
Don-vip 66dfea1b58 Add Sharky 775 + fix Diehl address swapping 2021-02-13 03:22:08 +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
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 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 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
Waldemar Faist a78aaec991 fix: correct offsets for techem hca 2021-02-06 18:29:47 +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 39f553322a Add test files. 2021-01-30 18:17:25 +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 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 8d8b1a2a9b Added whe5x hca. 2021-01-26 17:17:29 +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 f42891ed21 Updated test. 2021-01-24 14:12:56 +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 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
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
cinemarene c5e4ef0481
Add MKRadio4 to simulation_t1.txt 2020-11-22 21:20:55 +01:00
Fredrik Öhrström 3735c9fa70 Added ev200 and emerlin868. 2020-11-14 10:48:49 +01:00
Fredrik Öhrström ef97569ab3 Add missing file. 2020-11-12 01:20:14 +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 3bd42bbc70 Added sontex868 heat cost allocator. 2020-10-31 15:16:14 +01:00
Fredrik Öhrström b1a61d3a37 Add missing file. 2020-10-25 21:06:20 +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 c4226a8268 Added device and rssi_dbm to json. 2020-10-14 20:59:14 +02:00
Fredrik Öhrström 69af4f462f Add errno.h for macosx build. 2020-09-27 11:44:24 +02:00
Fredrik Öhrström cddfaecebb Standardize the remaining battery life to years. 2020-09-27 11:17:21 +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 e4f9eb23db Extract multical603 total kwh properly. 2020-09-26 09:14:26 +02:00
elbaek89 8bf405fc97
Create simulation_multical603.txt 2020-09-25 13:50:45 +02:00
Fredrik Öhrström 891e3f4228 Alarm test work again. 2020-09-18 20:05:59 +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 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
Damian Wrobel 6814ab35cd Remove executable bit 
Fixes the following warnings while building rpm package:

 *** WARNING: ./usr/src/debug/wmbusmeters-0.9.31-2.fc33.x86_64/src/meter_izar.cc is executable but has no shebang, removing executable bit
 *** WARNING: ./usr/src/debug/wmbusmeters-0.9.31-2.fc33.x86_64/src/meters.cc is executable but has no shebang, removing executable bit
 *** WARNING: ./usr/src/debug/wmbusmeters-0.9.31-2.fc33.x86_64/src/meters_common_implementation.h is executable but has no shebang, removing executable bit
 *** WARNING: ./usr/src/debug/wmbusmeters-0.9.31-2.fc33.x86_64/src/units.cc is executable but has no shebang, removing executable bit
 *** WARNING: ./usr/src/debug/wmbusmeters-0.9.31-2.fc33.x86_64/src/units.h is executable but has no shebang, removing executable bit

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2020-05-25 22:12:33 +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
Erwan Martin e9163063b8 Add the alarms to the IZAR meters. 2020-04-25 13:30:23 +02:00
Erwan Martin 376cbdfef6 Fix the IZAR tests. 2020-04-22 23:05:24 +02:00
Erwan Martin ba8a8edeb6 Add the new IZAR fields to the tests. 2020-04-22 23:00:18 +02:00
weetmuts 33952d803f Added divide by 3 to apator08. 2020-02-23 18:41:21 +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 418b2fd298 Adjusted tests for fhkvdataiii. 2020-02-16 19:18:46 +01:00
weetmuts 2f2f4a1e58 Small fixes. 2020-02-12 07:52:29 +01:00
cinemarene 9525758863
Add Techem FHKV data II/III 2020-02-11 22:35:57 +01:00
weetmuts af98f363cd Reverse esysm strings. 2020-02-07 12:34:44 +01:00
weetmuts 103f0da4cf Fix bug in esyswm. 2020-02-07 07:39:01 +01:00
weetmuts 8666dd95a1 New version. 2020-02-06 19:36:01 +01:00
weetmuts ed4e6e2d34 Updated fields esyswm. 2020-02-06 19:23:58 +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 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 389b72cbfb Added yet another apator162 offset. 2019-12-28 10:33:18 +01:00
weetmuts bf233da26c Added support for Hydrodigit water meter. 2019-12-07 14:46:28 +01:00