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

263 Commity (master)

Autor SHA1 Wiadomość Data
Fredrik Öhrström 3468bb9ffe Can now fetch data from mbus piigth meter. 2022-02-17 19:59:51 +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 05b987006f Normalize copyright notices and add script for automatic extraction of copyrights. 2022-02-12 15:28:17 +01:00
Fredrik Öhrström f89596d850 Add qwater driver and fix another bug in analyze. 2022-02-09 14:52:13 +01:00
Fredrik Öhrström c1f3031a94 Fix bug with mode 7 encryption and some non-encrypted data at end of telegram. 2022-02-08 20:51:13 +01:00
Fredrik Öhrström da943d3573 Refactor lse_07_17 driver. 2022-02-06 21:12:05 +01:00
Fredrik Öhrström 6823279b05 Significantly improve --analyze. 2022-02-06 18:49:55 +01:00
Fredrik Öhrström d8d0853f78 Refactor minomess. 2022-01-25 22:00:20 +01:00
Fredrik Öhrström 349524d547 Improve analyze so that it tests more relevant drivers. 2022-01-25 21:21:17 +01:00
Fredrik Öhrström 19834d81d1 Added driver c5isf. 2022-01-25 20:10:38 +01:00
Fredrik Öhrström 7bf811dd67 Refactor iperl driver. 2022-01-18 11:33:55 +01:00
Fredrik Öhrström 099bc33602 Refactor aventieshca. 2022-01-18 09:54:58 +01:00
Fredrik Öhrström 6af3b53d70 Add support for Kelvin. 2022-01-13 15:06:53 +01:00
Fredrik Öhrström 8df2bbdf47 Refactor sharky. 2022-01-13 11:45:37 +01:00
Fredrik Öhrström 840752155e Refactor apator08. 2022-01-09 09:36:25 +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
DomAtHome 309e1bdb73
Merge pull request #2 from DomAtHome/master 
master to sharky774
 2022-01-03 16:24:33 +01:00
Fredrik Öhrström 1ba56609b5 Refactoring with the intent to make it easier to write drivers. 2022-01-02 13:08:36 +01:00
Fredrik Öhrström d87663c826 Refactor by removing unnecessary c++ classes. 2021-12-31 16:47:29 +01:00
Fredrik Öhrström 40bc8bd908 Start refactoring by removing unnecessary c++ classes. 2021-12-31 12:27:57 +01:00
DomAtHome 69e8c9e2f9 Add support to Sharky 774 meter. 2021-12-29 19:46:37 +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 ae6e10a291 First step to implement --analyze. 2021-12-07 19:51:26 +01:00
Olli Salonen 143053b015 Add support for Zenner Minomess water meter 2021-11-30 13:17:34 +02:00
Fredrik Öhrström b5f3ccc152 Add parsing of variable length vifs. 2021-11-28 18:23:42 +01:00
Fredrik Öhrström 1f421834f0 Added stub for bfw240radio. 2021-10-24 17:54:36 +02:00
Fredrik Öhrström 731ae371d7 Added QHeat heat meter. 2021-10-24 17:18:53 +02:00
Jacek Leonhard 54a154c541 Added Munia 2021-10-16 11:41:48 +02:00
Fredrik Öhrström d6c83f65b2 Added hydrocalm3 driver. 2021-10-02 11:36:42 +02:00
Fredrik Öhrström 61dbc60fa7 Added UniSmart gas meter driver. 2021-09-23 12:06:12 +02:00
Fredrik Öhrström 0f209edc97 Update README, CHANGES and man page. 2021-08-08 17:16:52 +02:00
Fredrik Öhrström 6009382d4f Rename jsons to extra_constant_fields. 2021-08-02 00:22:13 +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
the78mole 826404ef17 Added Aventies HCA meter 2021-07-05 21:19:45 +02:00
the78mole 47b15021ce Added aventies water meter 2021-07-02 15:56:32 +02:00
mblnk 397bd7d3d8 Rename qwater55 to lse_07_17 2021-04-13 11:00:57 +02:00
mblnk 403017f640 Add stuff for QWater5.5 2021-04-12 20:21:50 +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 21d3595a53 A device (mbus/wmbus/tty) can now have an alias. A meter spec can now refer to this alias. 2021-03-14 09:41:35 +01:00
Fredrik Öhrström 5eea15b18c Add meterinfo parsing that can additionally handle bus,extras and bps. 2021-03-13 18:35:47 +01:00
Fredrik Öhrström 71c32c7852 Create bus manager. 2021-03-08 17:14:03 +01:00
Fredrik Öhrström a53cb1f77c Refactor MeterType to MeterDriver. 2021-03-08 08:43:56 +01:00
Fredrik Öhrström 4169574f4a Moved detection mapping into separate file. 2021-03-07 20:10:44 +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 36ca71d353 Added smoke meter ei6500. 2021-03-06 07:42:37 +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 dbf3dadc4c Work on mbus support. 2021-02-24 20:20:04 +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 73c4085a00 Move createMeter into meters.cc 2021-02-20 11:08:23 +01:00
Fredrik Öhrström 6fb0bdc647 Add support to give devices an alias name. 2021-02-20 08:24:33 +01:00
Fredrik Öhrström 51185e931b Added Apator Elf Heat meter. 2021-02-14 22:55:25 +01:00
Fredrik Öhrström b53adbf5b7 Added parity setting to serials. 2021-02-13 15:58:38 +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 be9bc54da5 Remove unnecessary comments. 2021-02-07 07:53:19 +01:00
Fredrik Öhrström 2a6ba20cbe Include regressions tests for gransystem. 2021-01-30 08:52:25 +01:00
Xael South 2b308ebe1c ccx01 2021-01-29 16:20:54 +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 f780f74384 Allow T1 mode for multical302 2021-01-24 20:36:59 +01:00
Fredrik Öhrström 28b416dfd6
Merge branch 'master' into feature/Techem_CompactVe 2021-01-24 11:25:51 +01:00
Fredrik Öhrström 5b29b9de4a Added regression test for compact5 heat meter. 2021-01-24 11:18:54 +01:00
Alex Muthmann 82c6bd3a55 Add support for Compact Ve Heat Meter 2021-01-22 23:36:03 +01:00
Marc-André Kolly 3b65f39429
Lorenz Water meter/Engelmann WaterStarM also exists as 0x07 (Water meter) 2021-01-11 15:19:25 +01:00
Fredrik Öhrström cff3eb5b30 Added yet another media type for the izar driver lookup. 2021-01-06 23:15:37 +01:00
Fredrik Öhrström 8f7a681da2 Added fhkvdataiv. 2021-01-06 19:48:56 +01:00
Fredrik Öhrström 18cbf887b2 Added minimal stub for tsd2. 2020-12-31 14:46:05 +01:00
Fredrik Öhrström cde87b9698 Added stub for whe46x driver, meter not yet understood. 2020-12-28 19:20:31 +01:00
Fredrik Öhrström 2616f64cb7 Fix for omnipower provided by janusboandersen. 2020-12-28 17:47:21 +01:00
balczezzz 43b44e9217
Update meters.h 
Support for BMETERS HYDROCALM3
 2020-12-09 22:16:44 +01:00
Fredrik Öhrström 7460ad0b5c Detect 0x08 type for fhkvdataiii. 2020-12-08 14:17:41 +01:00
Fredrik Öhrström 91a4e7de6e Detect version 0x70 for mkradio4 water meters. 2020-12-08 10:19:41 +01:00
Fredrik Öhrström ad535f888f Detect version 0x94 for fhkvdataiii. 2020-12-08 10:16:24 +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
cinemarene 9877bfbbee
Update files for MKRadio4 2020-11-22 20:39:28 +01:00
Fredrik Öhrström 3735c9fa70 Added ev200 and emerlin868. 2020-11-14 10:48:49 +01:00
Fredrik Öhrström e73008ff65 Added another weird izar mfct,type,ver combo. 2020-11-11 17:29:20 +01:00
Patrick Schwarz c71a95b815 Add Engelmann Sensostar2 to heat meters and recognize Engelmann FAW water meter radio module as waterstar beause it seems to be the same protocol 2020-11-10 14:20:04 +01:00
Fredrik Öhrström eae65a1961 Handle missing battery data in hydrus meter. 2020-11-08 23:43:12 +01:00
Fredrik Öhrström b8e9eb2431 Merge jacek27 contribution of Ultrimis water meter. 2020-11-03 05:23:48 +01:00
Fredrik Öhrström 3bd42bbc70 Added sontex868 heat cost allocator. 2020-10-31 15:16:14 +01:00
Fredrik Öhrström f633172597 Add new identification of amiplus compatible meter. 2020-10-26 16:48:30 +01:00
Fredrik Öhrström 097301c8b4 Add support for flowiq2200 meter. 2020-10-25 19:48:07 +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 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
Fredrik Öhrström 08362c7571
Merge pull request #168 from elbaek89/master 
Multical 603 support (work in progress)
 2020-09-26 08:45:47 +02:00
Fredrik Öhrström 0e076fce24 Print id for ignored telegrams when verbose logging. 2020-09-25 19:14:34 +02:00
Fredrik Öhrström ecd60045d9 Merge 2020-09-25 15:37:34 +02:00
Emil Madsen db7acae6cd Added Apparent Power to interface and meter 2020-09-24 21:23:06 +02:00
Emil Madsen 65ad8f624c Add support for the Gavazzi EM24 2020-09-24 19:49:45 +02:00
elbaek89 25e945f955
Added multical 603 
Meter detection entries based on the following telegram header obtained by using wmbusmeters -listento=c1 * 

Received telegram from: 80363608
          manufacturer: (KAM) Kamstrup Energi (0x2c2d)
           device type: Heat meter (0x04)
            device ver: 0x35
         device driver: unknown!
 2020-09-23 08:35:28 +02:00
Fredrik Öhrström 09821cf389 Rewrote locking from scratch switch to shared_ptr. 2020-09-21 21:55:21 +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 570c0c5454 Now simulations work. 2020-09-08 14:55:01 +02:00
Fredrik Öhrström d127f46807 Properly ignores non-wmbus devices. 2020-09-07 10:36:39 +02:00
Fredrik Öhrström b1fce2769a Merge branch 'master' into NewDetectionCode 2020-09-05 11:08:12 +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 27a590e135 Merge master. 2020-09-04 13:17:09 +02:00
Fredrik Öhrström c5d445b9b3 Added izar3 stub. 2020-09-04 12:13:06 +02:00
Fredrik Öhrström 481e156cf2 Added version 0x0b to lansenpu. 2020-09-04 11:52:30 +02:00
Fredrik Öhrström c48ad8e368 Added driver detection from telegrams. 2020-09-04 11:31:49 +02:00
Fredrik Öhrström 92c003f4b5 Merge master. 2020-09-02 14:38:47 +02:00
Arthur van Dorp 3190ef9e7c Add support for AquaMetro / Integra Topas Es Kr water meter 2020-09-01 21:53:05 +02:00
Fredrik Öhrström ab521e257d Merge master 2020-08-30 21:40:50 +02:00
Fredrik Öhrström 69df7f022a Detect and start wmbus dongles from within wmbusmeters. 2020-08-30 21:33:48 +02:00
Fredrik Öhrström ea783a3daf
Merge pull request #139 from IzeQube/master 
Added Techem Compact V heatmeter
 2020-08-26 08:45:28 +02:00
eborned b40c2cdf5b Added meter code for Multical 403 2020-08-18 18:20:30 +02:00
IzeQube 5fd9d3a4f5 Added Techem Compact V heatmeter 2020-07-26 15:04:18 +02:00
Fredrik Öhrström e84eb18cfa Added meter waterstarm. 2020-07-08 21:16:26 +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 0782557fb4 Fix bug that printed unnecessary warning for flowiq3100 meters. 2020-05-28 07:51:34 +02:00
Fredrik Öhrström 20bc6c6a02 Add --selectfields=... 2020-05-09 23:46:07 +02:00
Fredrik Öhrström 17cc575b87 Add support for extractin mfct data. 2020-04-01 17:21:11 +02:00
weetmuts f6df66d293 Added experimental support for apator08. 2020-02-23 13:55:37 +01:00
weetmuts f99dbadf88 Added --usestderr option. Added version 0x7c to iperl. install.sh now adds user to wmbusmeters group. 2020-02-22 21:16:24 +01:00
weetmuts a7c059d5df Added proper CRC trimming for CUL driver. 2020-02-15 21:18:21 +01:00
cinemarene 9525758863
Add Techem FHKV data II/III 2020-02-11 22:35:57 +01:00
weetmuts 884aed37ba Add eBZ wmbus meter. 2020-02-06 13:14:46 +01:00
weetmuts 67a9d70b7a Added support for the esyswm electricity meter addon. 2020-01-29 07:42:24 +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 bf233da26c Added support for Hydrodigit water meter. 2019-12-07 14:46:28 +01:00
weetmuts 78d7eb55da Added support for Hydrus meter. 2019-11-26 14:24:17 +01:00
Jacek Tomasiak 302b08a478 Add Izar water meter support 2019-10-29 21:48:36 +01: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 ff32981c13 Added support for meters that might transmit using different link modes. 2019-06-06 17:28:20 +02:00
weetmuts 500689a12f Added support for EurisII heat cost allocator. 2019-05-21 15:18:06 +02:00
weetmuts 094fc86e07 Added support for meter shell override. 2019-05-21 14:19:54 +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 2a47115cb9 Converted water meters to unit scaling. 2019-05-04 17:38:10 +02:00
weetmuts 1e053dd56b Almost done printing automatically from print spec. 2019-05-04 13:55:52 +02:00
weetmuts 65f29be6a3 Added unit conversions for heat meters. 2019-05-04 13:07:37 +02:00
weetmuts 61cb67942c Use X macros to generate lists of code. 2019-05-04 10:52:18 +02:00
weetmuts 787ecae509 Rewired vario heatmeter to kwh. 2019-05-04 08:52:25 +02:00