Updated CHANGES and README.

CHANGES

@@ -1,4 +1,12 @@
 
+Version 0.9.15: 2019-10-20
+
+Added Bmeter (rfmamb) and Lansen room sensors (lansenth).
+Added support for the rfmrx2 dongle.
+Added rawtty (eg /dev/ttyUSB0:38400) support for dongles
+that only transmit raw telegrams on the serial port.
+Added the ability to add static json data tailored for the meter.
+
 Version 0.9.14: 2019-09-16
 
 Added negative match rule for ids. You can now write:

README.md

@@ -97,7 +97,7 @@ depending on if you are running as a daemon or not.
 # Running without config files, good for experimentation and test.
 
 ```
-wmbusmeters version: 0.9.13
+wmbusmeters version: 0.9.15
 Usage: wmbusmeters {options} <device>{:suffix} ( [meter_name] [meter_type]{:<modes>} [meter_id] [meter_key] )*
 
 As <options> you can use:
@@ -125,19 +125,17 @@ As <options> you can use:
     --useconfig=<dir> load config files from dir/etc
     --verbose for more information
 
-For the <device> you can add a suffix: `/dev/ttyUSB0:amb8465` to
+For the <device> you can add a suffix: /dev/ttyUSB0:amb8465 to
 specify which wmbus dongle is connected to that device.
 Supported wmbus dongles are: IMST 871a (i, Amber 8465, RFM-RX2 and
 
-
-If you specify
-a baudrate as a suffix: `/dev/ttyUSB0:38400` then wmbusmeters will
+If you specify a baudrate as a suffix: /dev/ttyUSB0:38400 then wmbusmeters will
 simple listen to that serial port with that baudrate and expect raw
 wmbus telegrams.
 
-As a <device> you can also use: auto
-which will look for the links /dev/im87a,/dev/amb8475,/dev/rfmrx2 and /dev/rtlsdr (the
-links are automatically generated by udev if you have run the install scripts.)
+As a <device> you can also use: auto which will look for the
+links /dev/im87a,/dev/amb8475,/dev/rfmrx2 and /dev/rtlsdr (the links are
+automatically generated by udev if you have run the install scripts.)
 and start wmbusmeters with the proper tty device or rtlwmbus background process.
 
 As a <device> you can also use: rtlwmbus

src/main.cc

@@ -80,7 +80,7 @@ provided you with this binary. Read the full license for all details.
     if (cmdline->need_help) {
         printf("wmbusmeters version: " VERSION "\n");
         const char *msg = R"MANUAL(
-Usage: wmbusmeters {options} <device> ( [meter_name] [meter_type]{:<modes>} [meter_id] [meter_key] )*
+Usage: wmbusmeters {options} <device>{:suffix} ( [meter_name] [meter_type]{:<modes>} [meter_id] [meter_key] )*
 
 As <options> you can use:
 
@@ -100,29 +100,35 @@ As <options> you can use:
     --meterfilesaction=(overwrite|append) overwrite or append to the meter readings file
     --meterfilesnaming=(name|id|name-id) the meter file is the meter's: name, id or name-id
     --oneshot wait for an update from each meter, then quit
+    --reopenafter=<time> close/reopen dongle connection repeatedly every <time> seconds, eg 60s, 60m, 24h
     --separator=<c> change field separator to c
     --shell=<cmdline> invokes cmdline with env variables containing the latest reading
     --shellenvs list the env variables available for the meter
     --useconfig=<dir> load config files from dir/etc
     --verbose for more information
 
-As a <device> you can use: auto
-which will look for the links /dev/im87a,/dev/amb8475 and /dev/rtlsdr (the
-links are automatically generated by udev if you have run the install scripts.)
+For the <device> you can add a suffix: /dev/ttyUSB0:amb8465 to
+specify which wmbus dongle is connected to that device.
+Supported wmbus dongles are: IMST 871a (i, Amber 8465, RFM-RX2 and
+
+If you specify a baudrate as a suffix: /dev/ttyUSB0:38400 then wmbusmeters will
+simple listen to that serial port with that baudrate and expect raw
+wmbus telegrams.
+
+As a <device> you can also use: auto which will look for the
+links /dev/im87a,/dev/amb8475,/dev/rfmrx2 and /dev/rtlsdr (the links are
+automatically generated by udev if you have run the install scripts.)
 and start wmbusmeters with the proper tty device or rtlwmbus background process.
 
-As a <device> you can also use: the exact /dev/ttyUSB0 to your dongle if you do not want
-to install the udev rule.
-
 As a <device> you can also use: rtlwmbus
-to spawn the background process: \"rtl_sdr -f 868.95M -s 1.6e6 - | rtl_wmbus\"
+to spawn the background process: "rtl_sdr -f 868.95M -s 1600000 - | rtl_wmbus"
 You can also use: rtlwmbus:868.9M to use this fq instead. Fq tuning can sometimes
-be necessary. Or you can specify the entire background process command line: \"rtlwmbus:<commandline>\"
+be necessary. Or you can specify the entire background process command line: "rtlwmbus:<commandline>"
 
 As meter quadruples you specify:
 <meter_name> a mnemonic for this particular meter
 <meter_type> one of the supported meters
-(can be suffixed with :<modes> to specify which modes you expect the meter to use when transmitting)
+(can be suffixed with :<mode> to specify which mode you expect the meter to use when transmitting)
 <meter_id> an 8 digit mbus id, usually printed on the meter
 <meter_key> an encryption key unique for the meter
     if the meter uses no encryption, then supply ""
@@ -132,20 +138,26 @@ Kamstrup Multical 21 (multical21)
 Kamstrup flowIQ 3100 (flowiq3100)
 Sontex Supercom 587 (supercom587)
 Sensus iPERL (iperl)
-Techem MK Radio 3 (mkradio3)
+Apator at-wmbus-16-2 (apator162) (non-standard protocol)
+Water meter Techem MK Radio 3 (mkradio3) (non-standard protocol)
 
 Supported heat cost allocators:
 Qundis Q caloric (qcaloric)
-Heat Cost Allocator Innotas EurisII  (eurisii)
+Innotas EurisII  (eurisii)
 
-Supported heat meters:
-Techem Vario 4 (vario451)
+Supported heat meter:
+Heat meter Techem Vario 4 (vario451) (non-standard protocol)
+
+Supported room sensors:
+Lansen Thermometer/Hygrometer (lansenth)
+Bmeters RFM-AMB Thermometer/Hygrometer (rfmamb)
+
+Supported electricity meters:
+Tauron Amiplus (amiplus) (includes vendor apator and echelon)
 
 Work in progress:
-Water meter Apator at-wmbus-16-2 (apator162)
 Heat meter Kamstrup Multical 302 (multical302)
-Electricity meter Kamstrup Omnipower (omnipower) and Tauron Amiplus (amiplus)
-
+Electricity meter Kamstrup Omnipower (omnipower)
 )MANUAL";
         puts(msg);
     }