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

985 Commity (260aa7cfd8b42fa4af1639dd538d63c5865c4b28)

Autor SHA1 Wiadomość Data
weetmuts e86d32168b Added logging of data inside sn in ci=0x8d transport. 2019-11-20 07:14:35 +01:00
weetmuts d257228235 Fix bug that prevented /bin/sh in busybox from working. 2019-11-18 07:33:25 +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 bb7927f8f1 Added checks to handle corrupted telegrams. 2019-11-04 00:35:00 +01:00
weetmuts d3e221ffbf Updated README 2019-11-03 23:43:29 +01:00
weetmuts cae1144283 Improved testing. 2019-11-03 22:00:18 +01:00
weetmuts 291c0b2452 Continuous stream on stdin now works. 2019-11-03 17:05:08 +01:00
weetmuts 28d5495882 Added support for stdin and file.\n 2019-11-03 16:31:30 +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 573c999cff Add custom PRIOS key support 2019-10-29 21:48:37 +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 97cb924f35 Enable listento=t1,c1 in conf file. 2019-10-25 10:41:51 +02:00
weetmuts bfc3ba14af Updated README 2019-10-24 21:06:33 +02:00
weetmuts 6e9a6e33e2 Updated CHANGES and README. 2019-10-20 21:46:48 +02: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 df790c8335 Fix bug that always reopened device. 2019-10-18 00:31:59 +02:00
weetmuts 7f3166e9fe Added reopenafter setting 2019-10-16 19:56:59 +02:00
weetmuts 425430f8e3 Add support for raw serial input. 2019-10-15 14:32:32 +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 8231a91972 Fix bug. 2019-09-16 18:42:36 +02:00
weetmuts cd4820a357 Added support for negative id match rules. 2019-09-16 16:32:24 +02:00
weetmuts 327c851c31 Apator fixes. 2019-09-06 18:38:35 +02:00
weetmuts f48b182dfb Make safe copy of Telegram for each potential meter listener. 2019-09-06 11:48:52 +02:00
weetmuts c29c67276e Added another hash for compressed multical21 telegrams. 2019-09-01 17:21:32 +02:00
weetmuts ffd7b4cd45 Add more options to detect location of data in apator162 telegrams. 2019-09-01 17:05:19 +02:00
weetmuts 735fcdbf9a Fix when exiting daemon using rtl_wmbus. 2019-08-13 21:05:46 +02:00
weetmuts abaefdf829 Properly reopen stdin,stdout and stderr in daemon. 2019-08-13 20:46:50 +02:00
weetmuts b176e89a0c Print stderr output from rtl_sdr/rtl_wmbus on the wmbusmeters.log 2019-08-13 10:19:59 +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 8726a26175 Added missing quantity assert. 2019-07-07 22:04:06 +02:00
weetmuts d366a218f3 Fix error messages and README 2019-07-07 21:51:47 +02:00
weetmuts 6d6e1b5d93 Added meterfilesnaming 2019-06-20 14:28:52 +02:00
weetmuts bd63a73d0a Updated README and some debug strings. 2019-06-16 22:07:22 +02:00
weetmuts 911b0f766c HUP now triggers daemon to reload config files. 2019-06-11 18:49:26 +02:00
weetmuts 22bca9752c Fix bug in AMB8564 dongle code, receiving T1 now works! 2019-06-11 17:49:54 +02:00
weetmuts f1a8a976f9 Print multical/flowiq3100 correctly. 2019-06-06 23:04:16 +02:00
weetmuts 5559052799 Added support for id=8765* matching. 2019-06-06 18:16:24 +02:00
weetmuts 018c6210bf Fix listening mode when no meters supplied. 2019-06-06 17:50:04 +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 094fc86e07 Added support for meter shell override. 2019-05-21 14:19:54 +02:00
weetmuts 1111ea01bd Add support for listening to S1 and S1-m telegrams. 2019-05-21 10:34:09 +02:00
weetmuts da4c471afc Improve help. 2019-05-04 23:24:00 +02:00
weetmuts 8c2ece7d4d Bug fix. 2019-05-04 22:49:46 +02:00
weetmuts ffae9c91f3 Added tests for addconversions 2019-05-04 22:39:45 +02:00
weetmuts ba75bca37c Error should print on syslog. 2019-05-04 22:01:38 +02:00
weetmuts c16ee19348 Fix bug. 2019-05-04 21:04:20 +02:00
weetmuts 4c139c65f6 Removed unnecessary includes. 2019-05-04 20:58:41 +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 49f7410519 Moved printMeter default implementation common impl. 2019-05-04 16:37:35 +02:00
weetmuts c1ce426916 Automatic generation of json now works. 2019-05-04 16:19:23 +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 801c077ffe Add X macro for unit conversions. 2019-05-04 11:10:09 +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
Tomek 2b1a54672c Typo 2019-05-01 17:44:25 +02:00
Tomek 0e7a39ffff Initial support for Techem Vario 4 Typ 4.5.1 2019-05-01 17:17:21 +02:00
weetmuts 1baea908df Fixed typo. 2019-04-27 16:08:15 +02:00
weetmuts 7dc6970c9e Fix README 2019-04-27 13:34:50 +02:00
weetmuts cb0c6a5a54 Added inital support for meter MK Radio 3. 2019-04-27 13:31:13 +02:00
weetmuts a167f066c1 Fix default sample frequency. 2019-04-26 18:57:31 +02:00
weetmuts ad9e7d6ce3 Automatic generation of version nr now works. 2019-04-15 21:17:15 +02:00
weetmuts 6d7c88f4ab Added improved verbose message for received telegrams with failed crc checks. 2019-04-13 23:59:33 +02:00
weetmuts 01642e931f Improved serial command logging to print readable text. 2019-04-04 18:18:27 +02:00
weetmuts 85c3015e8c Remove unecessary variable. 2019-04-03 19:14:39 +02:00
weetmuts fcf1368b5e Macosx fix. 2019-04-03 19:13:59 +02:00
weetmuts 927bee871f Handle wrong group memberships better with info messages. 2019-04-03 18:57:18 +02:00
weetmuts 43f0d9b051 Exit and print info when background rtl_wmbus process fails to start. 2019-04-03 17:31:51 +02:00
weetmuts 7aae7aa6c2 Temporarily disable early exit of serial shell. 2019-04-02 19:50:18 +02:00
weetmuts 6fc79697c3 Added early exit if rtlwmbus child process terminates. 2019-04-02 19:23:21 +02:00
weetmuts 2b13e884b7 Added more device/media types. 2019-04-02 18:57:37 +02:00
weetmuts 139178537d Made amiplus have multiple manufacturers. 2019-04-01 23:49:24 +02:00
weetmuts bf5941ef42 Fetched list of manufacturers from dlms.com 2019-04-01 23:22:09 +02:00
weetmuts baff135418 Almost complete decoding of amiplus meter. 2019-03-20 22:16:45 +01:00
weetmuts 81f1fd448b Cleanups. 2019-03-19 21:32:28 +01:00
weetmuts 8a858999eb Fix version nr. 2019-03-19 21:04:35 +01:00
weetmuts e6dc78ce0b Added work in progress amiplus meter. 2019-03-19 20:53:44 +01:00
weetmuts c439af109b Adaptor now perhaps extracts a volume. 2019-03-19 18:51:57 +01:00
weetmuts 7394aa7175 Added fuzzying of dvparser. 2019-03-15 21:49:18 +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 ffa60e8be9 Add missing newlines. 2019-03-15 14:27:09 +01:00
weetmuts 113b5ace28 Fixed crash on abrupt end of data. 2019-03-15 14:21:50 +01:00
weetmuts 0e82309d72 Added work in progress support for Apator AT-WMBUS-16-2 meter. 2019-03-15 13:05:54 +01:00
weetmuts 49a1f8c3aa Use correct decryption mode for supercom587. 2019-03-15 09:16:23 +01:00
weetmuts 34cd0b3f52 Added max flow shell env to iperl. 2019-03-12 20:50:05 +01:00
weetmuts 3589d090c7 Improved README 2019-03-12 20:37:25 +01:00
weetmuts 093f7bb792 Added max_flow_m3h to iperl meter. 2019-03-12 20:05:05 +01:00
weetmuts 319cfd709a Only check for 2f2f after aes cbc decrypt. 2019-03-11 17:21:13 +01:00
weetmuts e4d0dfda4e Added support for --n1a to --n1f linkmodes for imst dongle. 2019-03-05 22:56:41 +01:00
weetmuts 7e72fe0f3f Added support for multiple comma separated ids. 2019-03-05 21:19:05 +01:00
weetmuts 87c4cb9256 Added support for id * wildcard. 2019-03-05 18:38:54 +01:00
Fredrik Ohrstrom 83c6a3fefc Fixed bug. 2019-03-04 12:34:19 +01:00
weetmuts c3b21f21d2 Remove unecessary load of set date twice for qcaloric. 2019-03-01 16:04:52 +01:00
weetmuts 25f4bd46da Updated README 2019-03-01 15:51:54 +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 0907b7f81b Added check for 2F2F 2019-02-28 16:53:09 +01:00
weetmuts 25a6a754eb Fix bug 2019-02-27 19:43:32 +01:00
weetmuts 08cdf9825e Improve manual 2019-02-27 19:42:21 +01:00
weetmuts cabcf04d20 Fix bug 2019-02-27 10:21:48 +01:00
weetmuts 8b0c3d8d29 Moved some forgotten log lines from printf to verbose 2019-02-26 23:40:44 +01:00
weetmuts f214390c41 Added rtlwmbus:<freq> support 2019-02-26 22:47:12 +01:00
weetmuts 58e89749d3 Updated command line options and added man page 2019-02-26 22:19:16 +01:00
weetmuts b4092bcdff Updated README and small fixes. 2019-02-26 09:33:10 +01:00
weetmuts b69b27707c Now rtlwmbus seems to work. 2019-02-25 22:03:20 +01:00
weetmuts dfe8c8bee5 More tests. 2019-02-24 17:31:32 +01:00
weetmuts be8bdf7e55 Daemon now stops if the dongle is unplugged. 2019-02-24 16:51:18 +01:00
weetmuts b6d89334b7 Added logfile support. 2019-02-24 15:20:55 +01:00
weetmuts 58206443a5 Rename CommandLine to Configuration. 2019-02-24 14:08:51 +01:00
weetmuts 1b7dee6c3d Daemon mode now works. Run 'make install' then insert dongle. 2019-02-24 09:58:31 +01:00
weetmuts b68cadfdc8 More work on running as daemon. 2019-02-23 23:11:09 +01:00
weetmuts 9f36535527 Allow ../../simulation.txt 2019-02-23 22:06:50 +01:00
weetmuts a182fa0974 Work on macosx build. 2019-02-23 21:36:00 +01:00
weetmuts 205d360e29 Work on macosx build. 2019-02-23 21:34:31 +01:00
weetmuts bca2e93b3c Work on macosx build. 2019-02-23 21:33:46 +01:00
weetmuts b119796c5c Work on macosx build. 2019-02-23 21:26:45 +01:00
weetmuts ff06425bf9 Tests for config files. 2019-02-23 21:21:17 +01:00
weetmuts 69cf31ace0 Source cleanup. 2019-02-23 18:30:16 +01:00
weetmuts f2413e3c64 Cleanup 2019-02-23 14:08:56 +01:00
weetmuts 1a64a23c8b Fix 2019-02-23 14:01:04 +01:00
weetmuts dbd8776778 Fix 2019-02-23 13:59:47 +01:00
weetmuts ae64e01cda Fix 2019-02-23 13:57:05 +01:00
weetmuts 8e67e2eb70 Moved sources into src. 2019-02-23 13:53:52 +01:00