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

1036 Commity (16507dcb23acfb9b10449c7248d877904e7b1174)

Autor SHA1 Wiadomość Data
Fredrik Öhrström b625b691dd Fix test. 2021-01-24 16:15:34 +01:00
Fredrik Öhrström f42891ed21 Updated test. 2021-01-24 14:12:56 +01:00
Fredrik Öhrström b3c5aa2415
Merge pull request #218 from deveth0/patch-1 
Remove scaling for Techem Compact 5
 2021-01-24 14:09:07 +01:00
Alex Muthmann 0893c82106
Remove scaling for Techem Compact 5 
As discussed in #217 we don#t need to scale down the values for the heat meter.
 2021-01-24 13:37:03 +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 6924b7e3e9
Merge pull request #215 from deveth0/feature/Techem_CompactVe 
Add support for Compact Ve Heat Meter
 2021-01-24 11:27:58 +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
Fredrik Öhrström 70c5b05572 Updated CHANGES. 2021-01-24 09:15:00 +01:00
Fredrik Öhrström f1c5d6ef9d Fix json field name. 2021-01-24 09:08:36 +01:00
Fredrik Öhrström 5787a8ff25
Merge pull request #209 from makuser/waterstarm-patch-1 
Update WaterStarM
 2021-01-24 09:06:32 +01:00
Fredrik Öhrström 3eee925143
Merge pull request #213 from rubdos/readme-fix 
RTL2838 doesn't seem to exist, change to 2832
 2021-01-24 08:48:46 +01:00
Alex Muthmann c44154b1f2 Add support for Compact Ve Heat Meter 2021-01-22 23:38:35 +01:00
Alex Muthmann 82c6bd3a55 Add support for Compact Ve Heat Meter 2021-01-22 23:36:03 +01:00
Ruben De Smet b35b5330ab RTL2838 doesn't seem to exist 2021-01-20 11:24:48 +01:00
Marc-André Kolly 4c9e209746
Standardize status field naming (`status` instead of `current_status`) and implement known error_codes 2021-01-11 15:33:30 +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 0d93f0dcbc Only pring warning unknown or wrong driver once. 2021-01-06 13:46:12 +01:00
Fredrik Öhrström a6f3e31971 Add missing file. 2021-01-06 13:28:56 +01:00
Fredrik Öhrström 6638e4f88f Only print warning about failed decryption once. 2021-01-06 12:46:37 +01:00
Fredrik Öhrström 18cbf887b2 Added minimal stub for tsd2. 2020-12-31 14:46:05 +01:00
Fredrik Öhrström eb33a0bf13 Prevent wmbusmeters from being confused by a file named rtlwmbus. 2020-12-31 10:42:53 +01:00
Fredrik Öhrström 781b084260 Add error message detecting missing pidfile argument to daemon. 2020-12-31 10:18:43 +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 1b55270784 Disable MacOSX build since brew is rebuiling the world. 2020-12-28 18:27:44 +01:00
Fredrik Öhrström 2616f64cb7 Fix for omnipower provided by janusboandersen. 2020-12-28 17:47:21 +01:00
Fredrik Öhrström 218e5e7a34 Added check for ncurses to configure. 2020-12-28 17:21:40 +01:00
Fredrik Öhrström 9c7d7dd270
Merge pull request #202 from dddevvv/master 
Improved multical403 support + M3/H <> L/H conversion
 2020-12-18 08:54:45 +01:00
dddevvv 871a9a5872 add M3/H to/from L/H conversion 2020-12-17 22:10:14 +00:00
dddevvv 73d4f9d680 multical403: recognize 0xF VIF byte (energy MJ) 2020-12-17 22:07:52 +00:00
Fredrik Öhrström ba0a916207
Merge pull request #195 from balczezzz/balczezzz-patch-2 
Add files via upload
 2020-12-10 18:09:07 +01:00
Fredrik Öhrström 8070d6e638
Merge pull request #196 from balczezzz/balczezzz-patch-1 
Update dvparser.h
 2020-12-10 18:08:54 +01:00
Fredrik Öhrström c334faa694
Merge pull request #197 from balczezzz/balczezzz-patch-3 
Update Makefile
 2020-12-10 18:08:42 +01:00
Fredrik Öhrström 7b9b9d024c
Merge pull request #198 from balczezzz/balczezzz-patch-4 
Update meters.h
 2020-12-10 18:08:28 +01:00
balczezzz 43b44e9217
Update meters.h 
Support for BMETERS HYDROCALM3
 2020-12-09 22:16:44 +01:00
balczezzz d4257b39f8
Update Makefile 
Added build config for BMETERS HYDROCALm3
 2020-12-09 22:12:56 +01:00
balczezzz 4667f56840
Add files via upload 
Added meter file for BMETERS HYDROCALM3
 2020-12-09 22:10:12 +01:00
balczezzz 05b2b91024
Update dvparser.h 
Extended the ReturnTemperature to 0x5E to accommodate BMETERS HYDROCALM3
 2020-12-09 21:04:20 +00: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 544effa171
Merge pull request #194 from dwrobel/Fix-rtl_sdr-invalid-option 
Fix rtl_sdr invalid option
 2020-12-08 10:06:55 +01:00
Damian Wrobel 6469e1ccab Fix rtl_sdr invalid option 
Fixes the following invalid option in the log:

 (shell) exec (capture output) "/bin/sh"
 (shell) wmbusmetersd[8259]: (shell) arg "-c"
 (shell) arg "rtl_sdr --help < /dev/null"
 (shell) output: >>>rtl_sdr: invalid option -- '-'
         rtl_sdr, an I/Q recorder for RTL2832 based DVB-T receivers

         Usage:         -f frequency_to_tune_to [Hz]
                       [-s samplerate (default: 2048000 Hz)]
                       [-d device_index (default: 0)]
                       [-g gain (default: 0 for auto)]
                       [-p ppm_error (default: 0)]
                       [-b output_block_size (default: 16 * 16384)]
                       [-n number of samples to read (default: 0, infinite)]
                       [-S force sync output (default: async)]
                       filename (a '-' dumps samples to stdout)

         <<<

Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
 2020-12-07 21:30:45 +01:00
Fredrik Öhrström ad12261630 Updated CHANGES 2020-12-05 13:11:05 +01:00
Fredrik Öhrström 14ad435d02 Added support for multical803. 2020-12-05 12:01:33 +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 d8b6583765
Merge pull request #190 from ZeWaren/freebsd-support 
Rewrite for loop so that it doesn't use any bash idioms.
 2020-11-29 15:01:25 +01:00
Erwan Martin 8e72fb10e0 Rewrite for loop so that it doesn't use any bash idioms. 2020-11-29 14:33:06 +01:00