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

90 Commity (e3e2941c32c6d5e1acc00040dc570531f2354131)

Autor SHA1 Wiadomość Data
Fredrik Öhrström e3e2941c32 Add new handling of meter drivers. 2022-01-08 09:58: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
Fredrik Öhrström ff654bdfa0 Add encrypted to type info when listening to all meters. 2021-12-27 14:30:54 +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
zivillian 058b7bd3c5 fix typo 2021-10-05 22:16:31 +02:00
Fredrik Öhrström 61dbc60fa7 Added UniSmart gas meter driver. 2021-09-23 12:06:12 +02:00
Damian Wrobel f6659accbb Fix snprintf format argument 
Fixes the following compilation error:

src/meters.cc: In member function
  'virtual std::string MeterCommonImplementation::unixTimestampOfUpdate()':
src/meters.cc:407:35: warning: format '%zu' expects argument of type 'size_t',
  but argument 4 has type 'time_t' {aka 'long int'} [-Wformat=]
  407 |     snprintf(ut, sizeof(ut)-1, "%zu", datetime_of_update_);
      |                                 ~~^   ~~~~~~~~~~~~~~~~~~~
      |                                   |   |
      |                                   |   time_t {aka long int}
      |                                   unsigned int
      |                                 %lu
RPM build errors:
error: Bad exit status from /var/tmp/rpm-tmp.9tme28 (%build)
    Bad exit status from /var/tmp/rpm-tmp.9tme28 (%build)
Child return code was: 1
 2021-08-12 19:36:26 +02:00
Fredrik Öhrström 0f209edc97 Update README, CHANGES and man page. 2021-08-08 17:16:52 +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 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
Fredrik Öhrström ecc9e7f5a4 Add first step to get mbus parsing working. 2021-03-14 12:15:49 +01: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 a74c36da15 Update README/CHANGES about new auto driver. 2021-03-07 20:40:41 +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 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 73c4085a00 Move createMeter into meters.cc 2021-02-20 11:08:23 +01:00
Don-vip 5d1343f121 Add frame preprocessing to transform Diehl addresses 2021-02-08 01:51:20 +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 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 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 0d93f0dcbc Only pring warning unknown or wrong driver once. 2021-01-06 13:46:12 +01:00
Fredrik Öhrström 18cbf887b2 Added minimal stub for tsd2. 2020-12-31 14:46:05 +01:00
Fredrik Öhrström 3735c9fa70 Added ev200 and emerlin868. 2020-11-14 10:48:49 +01:00
Fredrik Öhrström b3ab49c090 Added support for --selectfields=rssi_dbm,device 2020-11-12 09:56:51 +01:00
Fredrik Öhrström 3bd42bbc70 Added sontex868 heat cost allocator. 2020-10-31 15:16:14 +01:00
Fredrik Öhrström c4226a8268 Added device and rssi_dbm to json. 2020-10-14 20:59:14 +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 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
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 27a590e135 Merge master. 2020-09-04 13:17:09 +02:00
Fredrik Öhrström c48ad8e368 Added driver detection from telegrams. 2020-09-04 11:31:49 +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 3a7931fd07 Added support for lansen door/window sensor. 2020-06-30 11:29:55 +02:00