From 290d1bad06d15a0d2b94b455b50426f19c468181 Mon Sep 17 00:00:00 2001 From: weetmuts Date: Fri, 28 Dec 2018 20:20:30 +0100 Subject: [PATCH] Updated Readme and copyrights. --- README.md | 19 +++++++++++-------- cmdline.cc | 2 +- cmdline.h | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 3d116bd..78cde00 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,15 @@ Add --verbose for detailed debug information. Specifying auto as the device will automatically look for usb wmbus dongles on /dev/im871a and /dev/amb8465. -The meter types: multical21,flowiq3100,supercom587,iperl (water meters) are supported. -The meter types: multical302 (heat), omnipower (electricity) are work in progress. +Supported water meters: +Kamstrup Multical 21 (multical21) +Kamstrup flowIQ 3100 (flowiq3100) +Sontex Supercom 587 (supercom587) +Sensus iPERL (iperl) + +Work in progress: +Heat meter Kamstrup Multical 302 (multical302) +Electricity meter Kamstrup Omnipower (omnipower) ``` No meter quadruplets means listen for telegram traffic and print any id heard, @@ -142,6 +149,8 @@ Read for example the text file: HowToAddaNewMeter.txt # Good documents on the wireless mbus protocol: +https://oms-group.org/download4all/ + http://www.m-bus.com/files/w4b21021.pdf https://www.infineon.com/dgdl/TDA5340_AN_WMBus_v1.0.pdf @@ -158,12 +167,6 @@ The AES source code is copied from: https://github.com/kokke/tiny-AES128-C -The following other github projects were of great help: - -https://github.com/ffcrg/ecpiww - -https://github.com/CBrunsch/scambus/ - TODO: CRC checks are still missing. If the wrong AES key is supplied you probably get zero readings and sometimes warnings about wrong type of frames. diff --git a/cmdline.cc b/cmdline.cc index 6c7eed8..a5e76b9 100644 --- a/cmdline.cc +++ b/cmdline.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2017 Fredrik Öhrström + Copyright (C) 2017-2018 Fredrik Öhrström This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cmdline.h b/cmdline.h index 3192bd0..b29692a 100644 --- a/cmdline.h +++ b/cmdline.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2017 Fredrik Öhrström + Copyright (C) 2017-2018 Fredrik Öhrström This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by