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 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
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
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 d5adff8918 Added missing file. 2019-11-03 23:49:37 +01:00
Jacek Tomasiak 7e6d075d94 Fix medium type in IZAR meter output 
For some reason IZAR meters return "oil" as medium type.
Added override should hide this problem and return correct "water" type.
 2019-11-01 23:30:16 +01:00
Jacek Tomasiak 061e6e3cec Extract "last month total" from Izar telegrams 
This is a snapshot of total consumption value take around end of
last month.
 2019-11-01 22:47:00 +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 bfd7f843de Update json for rfmamb. 2019-10-20 21:39:42 +02:00
weetmuts 5d41faf710 Added explicit rfmrx2 device. 2019-10-20 20:39:12 +02:00
weetmuts 30543f6217 Added support for additional static json info. 2019-10-20 19:19:17 +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 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 b5d2734190 Added explicit consumption_at_set_date_1 which is an alias for consumption_at_set_date. 2019-07-07 23:03:25 +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 7c08b8dd59 Added understanding of error bits in EurisII meter. 2019-05-22 20:06:05 +02:00
weetmuts 2d48c09b21 Added error flags and all months to EurisII meter. 2019-05-21 19:27:50 +02:00
weetmuts a6a31fdf02 Adjusted key in json. 2019-05-21 15:30:34 +02:00
weetmuts 500689a12f Added support for EurisII heat cost allocator. 2019-05-21 15:18:06 +02:00
weetmuts 25b2e0bff1 Missing simulation file. 2019-05-04 22:59:11 +02:00
weetmuts 62c8e167c2 Converted all meters to new standard. 2019-05-04 20:52:05 +02:00
weetmuts fa1e08e7a3 Now converted almost all meters. 2019-05-04 19:56:17 +02:00
weetmuts 55d28a4baa Test for conversion added. 2019-05-04 16:27:37 +02:00
weetmuts 787ecae509 Rewired vario heatmeter to kwh. 2019-05-04 08:52:25 +02:00
Tomek 0e7a39ffff Initial support for Techem Vario 4 Typ 4.5.1 2019-05-01 17:17:21 +02:00
weetmuts cb0c6a5a54 Added inital support for meter MK Radio 3. 2019-04-27 13:31:13 +02:00
weetmuts 2b13e884b7 Added more device/media types. 2019-04-02 18:57:37 +02:00
weetmuts baff135418 Almost complete decoding of amiplus meter. 2019-03-20 22:16:45 +01:00
weetmuts d60493ee45 Added warning when T1 telegram is encrypted and no key was supplied. 2019-03-15 15:06:45 +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 a242fa9d23 Properly parses qcaloric telegrams. 2019-03-01 15:41:11 +01:00
weetmuts f399686b8b Added working parse of qcaloric. 2019-02-28 19:38:43 +01:00
weetmuts 748f03ecfc Moved simlation files into subdir. 2019-02-23 14:48:26 +01:00