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

224 Commity (78e7c475030f393b1309fad20ee8f30141300f3c)

Autor SHA1 Wiadomość Data
Fredrik Öhrström f650577ea2 Preparing tests for sorted json output keys. 2022-11-23 11:54:19 +01:00
Fredrik Öhrström f722d575e0 Add firmware_version and extra_info to abbb23 driver. 2022-11-23 11:06:00 +01:00
Fredrik Öhrström 69d4445ef0 Add dynamic field names based on storage nr etc. 2022-11-19 14:40:03 +01:00
Fredrik Öhrström f33ca02fa5 Refactor sontex868 driver to new format. 2022-11-16 17:34:29 +01:00
Fredrik Öhrström c97ab02362 Refacto hydrus to new driver format. 2022-11-15 21:04:09 +01:00
Fredrik Öhrström 06261663a5 Refactor izar to new driver format. 2022-11-15 20:37:28 +01:00
Fredrik Öhrström 1093db6151 Refactor topaseskr driver to new format. 2022-11-13 17:10:18 +01:00
Fredrik Öhrström 5675716286 Change nan:s to null:s in fields. Fix problem with irrelevant fields listed for --listfields for some meters. Refactor unismart driver. 2022-11-12 16:30:10 +01:00
Fredrik Öhrström fadce1cb60 Refactor esyswm to new driver format. 2022-11-11 12:24:00 +01:00
Fredrik Öhrström 19263bcb46 Refactor ehzp and fix on_time_h bug. 2022-11-10 22:07:57 +01:00
Fredrik Öhrström ab23cc4212 Test formulas. 2022-11-08 22:55:53 +01:00
Fredrik Öhrström a01cdc8c34 Add formulas and SIUnits. 2022-11-08 22:55:53 +01:00
Fredrik Öhrström 8a0eef2ece Pass matcher instead of NULL. 2022-10-13 20:30:28 +02:00
Fredrik Öhrström 9152e28882 Refactor q400 driver. 2022-10-12 17:55:47 +02:00
Fredrik Öhrström 1e31290622 Update itron driver. 2022-10-11 09:31:20 +02:00
Fredrik Öhrström b95c1feacb Add formula for calculating new fields based on received fields. Refactor driver ebzwmbe. 2022-10-10 21:43:11 +02:00
Fredrik Öhrström 504a5cf345 Add ability for driver to force mfct specific data after a specific point in telegram. 2022-09-28 21:20:43 +02:00
Fredrik Öhrström 30b33c9ede Make sure field matching is performed on the dv entries in an order where the offsets are increasing. 2022-09-28 13:48:17 +02:00
Fredrik Öhrström 658263d1d4 Refactor driver apator162. 2022-09-27 22:25:13 +02:00
Fredrik Öhrström 0643668f51 Handle broken telegram where multiple dventries match the same field. 2022-09-27 17:27:20 +02:00
Fredrik Öhrström 9ab034bff3 Improve qcaloric driver. 2022-09-10 19:03:14 +02:00
Fredrik Öhrström 79e1395fdc Print OPTIONAL fields that have previously received a value, even if the field is not part of the current telegram. Merge driver whe5x into qcaloric. 2022-09-10 08:44:55 +02:00
Fredrik Öhrström 84fe29069a Refactor multical21 and flowiq drivers. 2022-09-03 13:25:37 +02:00
Fredrik Öhrström 7ca0b7280c Handle meter_date and meter_datetime in minomess driver. 2022-09-02 09:53:58 +02:00
Fredrik Öhrström eafa1d9fc1 Improve minomess driver. Add default fields setting to drivers. 2022-09-01 17:44:59 +02:00
Fredrik Öhrström 41f4eca30a Refactor WMBus to BusDevice. 2022-08-20 19:58:28 +02:00
Fredrik Öhrström 09fa9ae7d4 Added Enercal F2 meter. 2022-08-09 15:22:47 +02:00
Fredrik Öhrström cb1f628560 Add RemainingBattery vif. 2022-06-24 10:10:14 +02:00
Fredrik Öhrström 470353abea Add relative humidity extractor. 2022-06-19 11:31:28 +02:00
Fredrik Öhrström 960d5d67db Added qualcosonic driver. 2022-06-18 23:03:18 +02:00
Fredrik Öhrström 269176fe27 Allocate driver list dynamically instead of statically to avoid static initialization ordering problem when compiling with hardened flags for rpm package. 2022-06-16 16:01:31 +02:00
Fredrik Öhrström e9a267beba Refactoring ci5sf. 2022-05-22 23:24:46 +02:00
Fredrik Öhrström c4b79b272f Improve merging of other status fields into the main status field. 2022-05-22 16:10:16 +02:00
Fredrik Öhrström 3208ce8199 Proper decoding of TPL status bits. 2022-05-21 14:22:56 +02:00
Fredrik Öhrström 42c84cb631 Add more includes for newer g++ compilers. 2022-05-13 16:20:55 +02:00
Fredrik Öhrström 19ec79fc41 Add handling of combinables. 2022-05-07 19:16:34 +02:00
Fredrik Öhrström a69310d432 Wait for response before polling next meter. 2022-05-01 20:54:12 +02:00
Fredrik Öhrström 8d164b7753 Add option pollinterval=10m to meter files. 2022-05-01 17:05:30 +02:00
Fredrik Öhrström 7b586e9d8a Added --pollinterval=10m 2022-04-27 21:09:50 +02:00
Fredrik Öhrström 21f1fc113b It is now possible to set mbus as link mode for any meter. 2022-04-27 19:18:30 +02:00
Fredrik Öhrström a234cf02c6 Use wildcard for mfct/version/type when using secondary addressing for mbus. 2022-04-27 18:51:51 +02:00
Fredrik Öhrström fc43958b76 Add Address object. 2022-04-26 11:44:00 +02:00
Fredrik Öhrström 3a6bb0a03d Add mbus support. 2022-04-25 19:38:36 +02:00
Fredrik Öhrström 61b9cd1df4 Fully converted driver ultraheat and values are stored based on vname()+xuantity(). 2022-04-23 23:02:17 +02:00
Fredrik Öhrström 18466f9f2b Fully converted driver minomess. 2022-04-23 18:32:30 +02:00
Fredrik Öhrström 788436b154 Fully converted driver amiplus. 2022-04-23 18:23:04 +02:00
Fredrik Öhrström ebae419f82 New field printing works for partially converted sharky driver. 2022-04-23 16:28:54 +02:00
Fredrik Öhrström 3e56671bfc User meter->getNumericValue instead of fi->getValueDouble. 2022-04-23 10:18:04 +02:00
Fredrik Öhrström 516ce2f8af Remove more or less unused field_name in FieldInfo. 2022-04-23 08:20:22 +02:00
Fredrik Öhrström 63ddd9f69b Add new setting of values in preparation for new meter implementations. 2022-04-22 17:28:57 +02:00
Fredrik Öhrström b7be96e25b Properly handle subunit in sharky driver. 2022-04-19 09:43:10 +02:00
Fredrik Öhrström 47c9b8c653 New driver model: foreach dventry test all field info matchers. 2022-04-19 09:10:14 +02:00
Fredrik Öhrström 11763b2f22 Refactor insert offset and key inside DVEntry add extractor methods to DVEntry. 2022-04-17 17:34:51 +02:00
Fredrik Öhrström 70a7078a57 Refactor. 2022-04-17 15:54:01 +02:00
Fredrik Öhrström fc552d0566 Add easy to access ordering of telegram content. 2022-04-17 12:47:06 +02:00
Fredrik Öhrström 4abc31d75c Refactor. 2022-04-17 11:23:45 +02:00
Fredrik Öhrström 29b5efef7c Refactor. 2022-04-16 21:26:51 +02:00
Fredrik Öhrström f058fb2501 Refactor. 2022-04-16 20:23:37 +02:00
Fredrik Öhrström 7e11dc8174 Refactor. 2022-04-16 18:15:30 +02:00
Fredrik Öhrström e01500ea30 Refactor. 2022-04-16 17:47:20 +02:00
Fredrik Öhrström cc89955004 Handle colons inside CMD(...) for a device. 2022-04-11 18:53:50 +02:00
Fredrik Öhrström 1feb9a2cb2 Improve c5isf driver. 2022-04-11 14:01:54 +02:00
Fredrik Öhrström b9a0823c85 When analyzing, not supplying a driver is the same as supplying auto. 2022-03-27 22:17:28 +02:00
Fredrik Öhrström 368230c929 Improve analyze with forced driver. 2022-03-27 14:43:10 +02:00
Fredrik Öhrström 790f78a2bf Give notification of old driver in analyze. 2022-03-27 12:09:18 +02:00
Fredrik Öhrström 97efb421d8 Add html option for analyze. 2022-03-06 22:42:44 +01:00
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 3547382184 Update CHANGES fix minor bug in analyze. 2022-02-09 14:30:06 +01:00
Fredrik Öhrström fe936f5062
Merge pull request #473 from ottmi/master 
Fix oneshot when more than one meter is defined but has not been started yet
 2022-02-09 13:02:50 +01:00
Michael Ott 0386fdd2a0 Fix oneshot when more than one meter is defined but has not been started yet 2022-02-08 21:08:48 +00: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 6823279b05 Significantly improve --analyze. 2022-02-06 18:49:55 +01:00
Fredrik Öhrström cb794cae42 Improve extraction of readble strings like fabricatio no and enhanced id. 2022-02-06 11:21:15 +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 c22e58f595 Add json to analyze output. 2022-01-25 20:42:46 +01:00
Fredrik Öhrström 19834d81d1 Added driver c5isf. 2022-01-25 20:10:38 +01:00
Fredrik Öhrström 6af3b53d70 Add support for Kelvin. 2022-01-13 15:06:53 +01:00
Fredrik Öhrström b322838b59 Added mbus driver ultraheat. 2022-01-13 09:51:08 +01:00
Fredrik Öhrström 9c3d39710a Add default msg for no bits in bits field. 2022-01-08 22:04:18 +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
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