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,8 MiB
Wykres commitów

193 Commity (master)

Autor SHA1 Wiadomość Data
Fredrik Öhrström dd39fe55f7 Add ppm support for rtlsdr. 2021-03-06 16:28:42 +01:00
Fredrik Öhrström 0c9fdcd81d Fix so that rtl433 works again. 2021-03-06 15:44:38 +01:00
Fredrik Öhrström 30c2926489 When looking for rtl_sdr/rtl_wmbus first look in the same dir as wmbusmeters was found. 2021-03-06 14:16:47 +01:00
Fredrik Öhrström 408cc19485 Add support for extra parameters to wmbus device. 2021-03-06 09:45:31 +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
Fredrik Öhrström 658f283f2e Added mbus rawtty driver. 2021-02-13 15:18:59 +01:00
Fredrik Öhrström bb5dae27a0 Add info on third extension code marker. 2021-02-12 16:46:40 +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 d50f13b240 Now properly handles different dll id and tpl id. 2021-01-30 17:58:00 +01:00
Fredrik Öhrström c4239412a0 Add warning when using auto,rtlsdr dongle and rtl_wmbus/sdr is missing. 2020-12-05 11:33:47 +01:00
Fredrik Öhrström dcb46566da Do not print >already configured< forever in debug mode. 2020-11-12 10:26:12 +01:00
Fredrik Öhrström 5c2c914070 Now handles /dev/ttyUSB0 coming and going. 2020-11-12 00:59:12 +01:00
Fredrik Öhrström a610179331 Enable stdin/file/simulation before event loop started, enable other devices after event loop started. 2020-11-11 22:49:20 +01:00
Fredrik Öhrström 1f4083e6d0 Start eventloop after first detect of stdin device. 2020-11-11 21:44:50 +01:00
Fredrik Öhrström 3b86b00b96 Added --silent and test for stdin pipe close down. 2020-11-11 19:29:00 +01:00
Fredrik Öhrström 85786cbe8c Fix bug that caused auto even though only a single device expected, like: rtlwmbus[1234] 2020-11-11 17:08:24 +01:00
Fredrik Öhrström 966487fcb8 Fix bug where <device>:c1 did not pick the right linkmode. 2020-11-01 21:49:57 +01:00
Fredrik Öhrström d297636b09 Fix bug that prevented rtlwmbus to be detected. 2020-11-01 21:25:23 +01:00
Fredrik Öhrström 5e273ddb7e Added donotprobe=<device> and fixed so that it does not probe if a device is specified or rtlwmbus is specified. 2020-11-01 15:18:13 +01:00
Fredrik Öhrström 3bd42bbc70 Added sontex868 heat cost allocator. 2020-10-31 15:16:14 +01:00
Fredrik Öhrström 7ff4690539 Fix bug that prevented explicit tty:device:c1 to work. 2020-10-26 15:30:43 +01:00
Fredrik Öhrström f4ad901cee Remove wmbus dongles for which I have no documentation. 2020-10-25 21:43:32 +01:00
Fredrik Öhrström ea530a7531 Added --ignoreduplicates 2020-10-25 20:57:25 +01:00
Fredrik Öhrström 728bf66752 Add unique device id in addition to normal device id. 2020-10-25 15:28:52 +01:00
Fredrik Öhrström c16409c28a List fields improvement. 2020-10-24 22:20:55 +02:00
Fredrik Öhrström 5e938202c8 Update rc1180 code. 2020-10-24 16:16:50 +02:00
Fredrik Öhrström c4226a8268 Added device and rssi_dbm to json. 2020-10-14 20:59:14 +02:00
Fredrik Öhrström f7fd3fef18 Proper support for using the rtlsdr dongle serial. 2020-10-12 20:34:15 +02:00
Fredrik Öhrström 4c18893fd7 Alarm for specified device not found, is now working. 2020-10-12 06:55:48 +02:00
Fredrik Öhrström 291a9be8e5 The word device is reserved for wmbus dongles. 2020-10-11 11:01:10 +02:00
Fredrik Öhrström 0c2eb722d1 Now auto detects any number rtlwmbus devices. 2020-10-07 21:40:33 +02:00
Fredrik Öhrström d8e7be70c4 A single rtlwmbus now works. 2020-10-05 19:47:58 +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 f5ff15af2c Use librtlsdr to detect rtl-sdr dongle. 2020-09-27 19:40:05 +02:00
Fredrik Öhrström d443fd4ea2 Add partial support for RC1180. 2020-09-26 13:52:24 +02:00
Fredrik Öhrström eb89c7b31d Moved waitForResponse into common implementation. 2020-09-26 00:10:34 +02:00
Fredrik Öhrström 7e07af03e7 Added resetafter, regular reset. 2020-09-25 23:56:50 +02:00
Fredrik Öhrström 8568437635 Partially removed reopenafter. 2020-09-25 22:27:34 +02:00
Fredrik Öhrström 371a3c3cf1 Stop early if listening mode is set for auto and no meters. 2020-09-25 21:35:17 +02:00
Fredrik Öhrström 6ecd278656 Properly resets wmbus dongle on alarm. 2020-09-25 21:16:20 +02:00
Fredrik Öhrström 1022a24799 Non-working implies opened first. 2020-09-25 17:02:42 +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 71ef2b2784 Improved locking. 2020-09-18 21:22:08 +02:00
Fredrik Öhrström 891e3f4228 Alarm test work again. 2020-09-18 20:05:59 +02:00
Fredrik Öhrström 802e62cbbd Now logging defaults to stderr. 2020-09-13 16:55:22 +02:00
Fredrik Öhrström 71804f1d92 Audo detect swradio to start rtlwmbus. 2020-09-13 15:39:09 +02:00
Fredrik Öhrström e754cda295 Added --listmeters and --listmeters=water 2020-09-13 13:24:46 +02:00
Fredrik Öhrström 93272b1b0c Added missing include. 2020-09-08 22:34:24 +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 1653aea0b2 Detection loop is working. 2020-09-06 10:41:04 +02:00
Fredrik Öhrström 8e6d39492d Update README. 2020-09-02 14:36:10 +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 78a353de59 Restore event loop start and disable getconfig in amb8465 reset. 2020-08-19 20:45:38 +02:00
Fredrik Öhrström b7dffe39f1 Start event loop before configuring wmbus dongle. 2020-08-19 20:11:18 +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 f9ab051a40 Merge branch 'master' into AddAlarm 2020-08-09 17:18:37 +02:00
Fredrik Öhrström c71c35f1cb Send SIGTERM to pid instead of SIGINT to group. 2020-08-09 17:03:59 +02:00
Fredrik Öhrström 5038753906 Add alarm functionality. 2020-08-01 21:56:46 +02:00
Fredrik Öhrström 8191f45888 Inital work to add alarms. 2020-07-30 11:18:44 +02:00
Fredrik Öhrström 2cc26129b4 Fix build problems. 2020-05-11 11:59:47 +02:00
Fredrik Öhrström 20bc6c6a02 Add --selectfields=... 2020-05-09 23:46:07 +02:00
Fredrik Öhrström b6a2776e79 Temporarily disable detection. 2020-03-24 16:07:41 +01:00
Fredrik Öhrström 7635b11f5f Try to detect. 2020-03-22 18:43:09 +01:00
Fredrik Öhrström 7b9e9a3b8d Started working on wmb13u dongle. 2020-03-22 14:20:47 +01:00
weetmuts 9ce676675a Fix problem with rtl_sdr hanging when stopping daemon. 2020-02-26 11:02:47 +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 b3a1d30f22 Only invoke binary test if using the default command line. 2020-02-17 18:14:04 +01:00
weetmuts 17067e44ec Improved error message and README. 2020-02-17 18:09:27 +01:00
weetmuts d7fbf3a3a8 Added info message when /usr/bin/rtl_sdr or /usr/bin/rtl_wmbus is missing. 2020-02-17 12:16:45 +01:00
weetmuts a7c059d5df Added proper CRC trimming for CUL driver. 2020-02-15 21:18:21 +01:00
weetmuts 884aed37ba Add eBZ wmbus meter. 2020-02-06 13:14:46 +01:00
weetmuts ffeed3f798 Updated README and fixed auto rtlsdr problem. 2020-02-02 17:05:10 +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 315e216efc Added support for cmdline override of config file for device and listento. 2020-01-19 17:55:46 +01:00
weetmuts 7fa9f1079a Added support for d1tc wmbus dongle. 2019-12-28 11:19:50 +01:00
weetmuts cf7efb8127 Added support for meterfilestimestamp 2019-12-11 18:56:34 +01:00
chester4444 582e7285cb
modified for CUL support 2019-11-22 18:53:52 +01:00
weetmuts d3e221ffbf Updated README 2019-11-03 23:43:29 +01:00
weetmuts 28d5495882 Added support for stdin and file.\n 2019-11-03 16:31:30 +01:00
weetmuts 7876804a0b Add recovery when rawtty gets out of sync. 2019-10-28 22:10:29 +01: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 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 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 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 6d6e1b5d93 Added meterfilesnaming 2019-06-20 14:28:52 +02:00
weetmuts 911b0f766c HUP now triggers daemon to reload config files. 2019-06-11 18:49:26 +02:00
weetmuts 5559052799 Added support for id=8765* matching. 2019-06-06 18:16:24 +02:00