mirror
/
wmbusmeters
kopia lustrzana https://github.com/weetmuts/wmbusmeters
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Changing links to new repo 

Changing in links weetmuts to wmbusmeters
pull/912/head
BIBOLV 2023-03-11 17:43:07 +02:00
rodzic a3ea9d28ad
commit d633ff9eaa
20 zmienionych plików z 41 dodań i 41 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
.github/workflows/build_snap.yml vendored
Wyświetl plik

@ -29,7 +29,7 @@ jobs:
id: meta id: meta
uses: docker/metadata-action@v4 uses: docker/metadata-action@v4
with: with:
images: weetmuts/wmbusmeters images: wmbusmeters/wmbusmeters
tags: type=ref,event=tag tags: type=ref,event=tag
- -
name: Build name: Build

14
README.md
Wyświetl plik

@ -6,16 +6,16 @@ wireless wm-bus meters. The readings can then be published using
MQTT, curled to a REST api, inserted into a database or stored in a MQTT, curled to a REST api, inserted into a database or stored in a
log file. log file.
[FAQ/WIKI/MANUAL pages](https://weetmuts.github.io/wmbusmeterswiki/) [FAQ/WIKI/MANUAL pages](https://wmbusmeters.github.io/wmbusmeters-wiki/)
The program runs on GNU/Linux, MacOSX, FreeBSD, and Raspberry Pi. The program runs on GNU/Linux, MacOSX, FreeBSD, and Raspberry Pi.
| System | Status | | System | Status |
| ------------ |:-------------:| | ------------ |:-------------:|
| Ubuntu | [![Build Ubuntu Status](https://github.com/weetmuts/wmbusmeters/workflows/Build%20Ubuntu/badge.svg)](https://github.com/weetmuts/wmbusmeters/actions)| | Ubuntu | [![Build Ubuntu Status](https://github.com/wmbusmeters/wmbusmeters/workflows/Build%20Ubuntu/badge.svg)](https://github.com/wmbusmeters/wmbusmeters/actions)|
| MacOSX | [![Build MacOSX Status](https://github.com/weetmuts/wmbusmeters/workflows/Build%20MacOSX/badge.svg)](https://github.com/weetmuts/wmbusmeters/actions)| | MacOSX | [![Build MacOSX Status](https://github.com/wmbusmeters/wmbusmeters/workflows/Build%20MacOSX/badge.svg)](https://github.com/wmbusmeters/wmbusmeters/actions)|
| Docker | [![Build Docker Status](https://github.com/weetmuts/wmbusmeters/workflows/Build%20docker/badge.svg)](https://hub.docker.com/r/weetmuts/wmbusmeters/)| | Docker | [![Build Docker Status](https://github.com/wmbusmeters/wmbusmeters/workflows/Build%20docker/badge.svg)](https://hub.docker.com/r/wmbusmeters/wmbusmeters/)|
| Snap | [![Build Snap Status](https://github.com/weetmuts/wmbusmeters/workflows/Build%20Snap/badge.svg)](https://snapcraft.io/wmbusmeters)| | Snap | [![Build Snap Status](https://github.com/wmbusmeters/wmbusmeters/workflows/Build%20Snap/badge.svg)](https://snapcraft.io/wmbusmeters)|
# Distributions # Distributions
@ -29,12 +29,12 @@ Availability of **wmbusmeters** for other Linux distributions can be checked on
# Docker # Docker
Experimental docker containers are available here: https://hub.docker.com/r/weetmuts/wmbusmeters Experimental docker containers are available here: https://hub.docker.com/r/wmbusmeters/wmbusmeters
# Snap # Snap
Experimental snaps are available here: https://snapcraft.io/wmbusmeters Experimental snaps are available here: https://snapcraft.io/wmbusmeters
Read the wiki for more info on how to use the snap: https://weetmuts.github.io/wmbusmeterswiki/SNAP.html Read the wiki for more info on how to use the snap: https://wmbusmeters.github.io/wmbusmeters-wiki/SNAP.html
# Build from source and run as a daemon # Build from source and run as a daemon

6
configure vendored
Wyświetl plik

@ -583,7 +583,7 @@ PACKAGE_TARNAME='wmbusmeters'
PACKAGE_VERSION='wmbusmeters' PACKAGE_VERSION='wmbusmeters'
PACKAGE_STRING='wmbusmeters wmbusmeters' PACKAGE_STRING='wmbusmeters wmbusmeters'
PACKAGE_BUGREPORT='oehrstroem@gmail.com' PACKAGE_BUGREPORT='oehrstroem@gmail.com'
PACKAGE_URL='https://github.com/weetmuts/wmbusmeters' PACKAGE_URL='https://github.com/wmbusmeters/wmbusmeters'
# Factoring default headers for most tests. # Factoring default headers for most tests.
ac_includes_default="\ ac_includes_default="\
@ -1336,7 +1336,7 @@ Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations. it to find libraries and programs with nonstandard names/locations.
Report bugs to <oehrstroem@gmail.com>. Report bugs to <oehrstroem@gmail.com>.
wmbusmeters home page: <https://github.com/weetmuts/wmbusmeters>. wmbusmeters home page: <https://github.com/wmbusmeters/wmbusmeters>.
_ACEOF _ACEOF
ac_status=$? ac_status=$?
fi fi
@ -3988,7 +3988,7 @@ Configuration files:
$config_files $config_files
Report bugs to <oehrstroem@gmail.com>. Report bugs to <oehrstroem@gmail.com>.
wmbusmeters home page: <https://github.com/weetmuts/wmbusmeters>." wmbusmeters home page: <https://github.com/wmbusmeters/wmbusmeters>."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

2
configure.ac
Wyświetl plik

@ -15,7 +15,7 @@
# #
AC_PREREQ([2.69]) AC_PREREQ([2.69])
AC_INIT(wmbusmeters, wmbusmeters, oehrstroem@gmail.com,,https://github.com/weetmuts/wmbusmeters) AC_INIT(wmbusmeters, wmbusmeters, oehrstroem@gmail.com,,https://github.com/wmbusmeters/wmbusmeters)
AC_CONFIG_AUX_DIR([autoconf]) AC_CONFIG_AUX_DIR([autoconf])
AC_CANONICAL_BUILD AC_CANONICAL_BUILD

6
deb/control
Wyświetl plik

@ -8,9 +8,9 @@ Build-Depends: debhelper-compat (= 13)
, jq , jq
, netcat-openbsd , netcat-openbsd
Standards-Version: 4.5.1 Standards-Version: 4.5.1
Homepage: https://github.com/weetmuts/wmbusmeters Homepage: https://github.com/wmbusmeters/wmbusmeters
Vcs-Browser: https://github.com/weetmuts/wmbusmeters Vcs-Browser: https://github.com/wmbusmeters/wmbusmeters
Vcs-Git: https://github.com/weetmuts/wmbusmeters.git Vcs-Git: https://github.com/wmbusmeters/wmbusmeters.git
Rules-Requires-Root: no Rules-Requires-Root: no
Package: wmbusmeters Package: wmbusmeters

2
deb/copyright
Wyświetl plik

@ -1,6 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: wmbusmeters Upstream-Name: wmbusmeters
Source: https://github.com/weetmuts/wmbusmeters Source: https://github.com/wmbusmeters/wmbusmeters
Upstream-Contact: Fredrik Öhrström <oehrstroem@gmail.com> Upstream-Contact: Fredrik Öhrström <oehrstroem@gmail.com>
Files: * Files: *

2
deb/watch
Wyświetl plik

@ -4,5 +4,5 @@
version=4 version=4
opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%wmbusmeters-$1.tar.gz%" \ opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%wmbusmeters-$1.tar.gz%" \
https://github.com/weetmuts/wmbusmeters/tags \ https://github.com/wmbusmeters/wmbusmeters/tags \
(?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate

2
doc/CreateDriver.md
Wyświetl plik

@ -34,7 +34,7 @@ you will see a log like this:
``` ```
[2021-07-05_21:07:30] (meter) ABOGGLKZ: meter detection did not match the selected driver eurisii! correct driver is: unknown! [2021-07-05_21:07:30] (meter) ABOGGLKZ: meter detection did not match the selected driver eurisii! correct driver is: unknown!
(meter) Not printing this warning again for id: 60900126 mfct: (AAA) Aventies, Germany (0x421) type: Heat Cost Allocator (0x08) ver: 0x55 (meter) Not printing this warning again for id: 60900126 mfct: (AAA) Aventies, Germany (0x421) type: Heat Cost Allocator (0x08) ver: 0x55
[2021-07-05_21:07:30] (meter) please consider opening an issue at https://github.com/weetmuts/wmbusmeters/ [2021-07-05_21:07:30] (meter) please consider opening an issue at https://github.com/wmbusmeters/wmbusmeters/
[2021-07-05_21:07:30] (meter) to add support for this unknown mfct,media,version combination [2021-07-05_21:07:30] (meter) to add support for this unknown mfct,media,version combination
(meter) ABOGGLKZ: yes for me (meter) ABOGGLKZ: yes for me
(meter) ABOGGLKZ eurisii handling telegram from 60900126 (meter) ABOGGLKZ eurisii handling telegram from 60900126

2
docker/Dockerfile
Wyświetl plik

@ -1,6 +1,6 @@
FROM multiarch/alpine:${TARGETARCH}${TARGETVARIANT}-latest-stable AS build FROM multiarch/alpine:${TARGETARCH}${TARGETVARIANT}-latest-stable AS build
RUN apk add --no-cache alpine-sdk gcc linux-headers ncurses-dev librtlsdr-dev cmake libusb-dev bash RUN apk add --no-cache alpine-sdk gcc linux-headers ncurses-dev librtlsdr-dev cmake libusb-dev bash
RUN git clone https://github.com/weetmuts/wmbusmeters.git && \ RUN git clone https://github.com/wmbusmeters/wmbusmeters.git && \
git clone https://github.com/weetmuts/rtl-wmbus.git && \ git clone https://github.com/weetmuts/rtl-wmbus.git && \
git clone https://github.com/merbanan/rtl_433.git git clone https://github.com/merbanan/rtl_433.git
WORKDIR /wmbusmeters WORKDIR /wmbusmeters

16
docker/README.md
Wyświetl plik

@ -4,7 +4,7 @@ The program receives and decodes C1,T1 or S1 telegrams
utility meter readings. The readings can then be published using utility meter readings. The readings can then be published using
MQTT, curled to a REST api, inserted into a database or stored in a log file. MQTT, curled to a REST api, inserted into a database or stored in a log file.
[FAQ/WIKI/MANUAL pages](https://github.com/weetmuts/wmbusmeters) [FAQ/WIKI/MANUAL pages](https://github.com/wmbusmeters/wmbusmeters)
- Supported architectures - Supported architectures
- ARMv7 32-bit (`armv7`) - ARMv7 32-bit (`armv7`)
@ -22,7 +22,7 @@ docker run -d --privileged \
-v /etc/localtime:/etc/localtime:ro \ -v /etc/localtime:/etc/localtime:ro \
-v /opt/wmbusmeters:/wmbusmeters_data \ -v /opt/wmbusmeters:/wmbusmeters_data \
-v /dev/:/dev/ \ -v /dev/:/dev/ \
weetmuts/wmbusmeters wmbusmeters/wmbusmeters
``` ```
### Command line Options ### Command line Options
@ -40,7 +40,7 @@ If docker-compose.yml file is being used, then it is also possible to copy/paste
version: "2" version: "2"
services: services:
wmbusmeters: wmbusmeters:
image: weetmuts/wmbusmeters image: wmbusmeters/wmbusmeters
container_name: wmbusmeters container_name: wmbusmeters
restart: always restart: always
volumes: volumes:
@ -48,7 +48,7 @@ services:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /dev/:/dev/ - /dev/:/dev/
``` ```
Then, `docker-compose pull` can be used to pull the latest weetmuts/wmbusmeters image, `docker-compose up -d` to start the wmbusmeters container service, and `docker-compose down` to stop the wmbusmeters service and delete the container. It must be noted that those commands will also pull, start, and stop any other services defined in docker-compose.yml. Then, `docker-compose pull` can be used to pull the latest wmbusmeters/wmbusmeters image, `docker-compose up -d` to start the wmbusmeters container service, and `docker-compose down` to stop the wmbusmeters service and delete the container. It must be noted that those commands will also pull, start, and stop any other services defined in docker-compose.yml.
## How to run docker in unprivileged mode ## How to run docker in unprivileged mode
@ -73,7 +73,7 @@ docker run -d \
-v /etc/localtime:/etc/localtime:ro \ -v /etc/localtime:/etc/localtime:ro \
-v /opt/wmbusmeters:/wmbusmeters_data \ -v /opt/wmbusmeters:/wmbusmeters_data \
--device=/dev/im871a \ --device=/dev/im871a \
weetmuts/wmbusmeters wmbusmeters/wmbusmeters
``` ```
### Command line Options ### Command line Options
@ -91,7 +91,7 @@ If docker-compose.yml file is being used, then it is also possible to copy/paste
version: "2" version: "2"
services: services:
wmbusmeters: wmbusmeters:
image: weetmuts/wmbusmeters image: wmbusmeters/wmbusmeters
container_name: wmbusmeters container_name: wmbusmeters
restart: always restart: always
volumes: volumes:
@ -101,8 +101,8 @@ services:
- /dev/im871a - /dev/im871a
``` ```
Then, `docker-compose pull` can be used to pull the latest weetmuts/wmbusmeters image, `docker-compose up -d` to start the wmbusmeters container service, and `docker-compose down` to stop the wmbusmeters service and delete the container. It must be noted that those commands will also pull, start, and stop any other services defined in docker-compose.yml. Then, `docker-compose pull` can be used to pull the latest wmbusmeters/wmbusmeters image, `docker-compose up -d` to start the wmbusmeters container service, and `docker-compose down` to stop the wmbusmeters service and delete the container. It must be noted that those commands will also pull, start, and stop any other services defined in docker-compose.yml.
### Issues / Contributing ### Issues / Contributing
Please raise any issues with this container at its [GitHub repo](https://github.com/weetmuts/wmbusmeters) Please raise any issues with this container at its [GitHub repo](https://github.com/wmbusmeters/wmbusmeters)

2
scripts/collect_copyrights.sh
Wyświetl plik

@ -18,7 +18,7 @@ trap finish EXIT
cat > $TMP <<EOF cat > $TMP <<EOF
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: wmbusmeters Upstream-Name: wmbusmeters
Source: https://github.com/weetmuts/wmbusmeters Source: https://github.com/wmbusmeters/wmbusmeters
Upstream-Contact: Fredrik Öhrström <oehrstroem@gmail.com> Upstream-Contact: Fredrik Öhrström <oehrstroem@gmail.com>
Files: * Files: *

2
scripts/install_systemd_service.sh
Wyświetl plik

@ -33,7 +33,7 @@ fi
cat <<'EOF' > $CURR_WMBS cat <<'EOF' > $CURR_WMBS
[Unit] [Unit]
Description="wmbusmeters service" Description="wmbusmeters service"
Documentation=https://github.com/weetmuts/wmbusmeters Documentation=https://github.com/wmbusmeters/wmbusmeters
Documentation=man:wmbusmeters(1) Documentation=man:wmbusmeters(1)
After=network.target After=network.target
StopWhenUnneeded=false StopWhenUnneeded=false

2
snap/snapcraft.yaml
Wyświetl plik

@ -31,7 +31,7 @@ parts:
- launcher.sh - launcher.sh
wmbusmeters: wmbusmeters:
source: "https://github.com/weetmuts/wmbusmeters.git" source: "https://github.com/wmbusmeters/wmbusmeters.git"
source-type: git source-type: git
override-pull: | override-pull: |
craftctl default craftctl default

2
src/driver_apator162.cc
Wyświetl plik

@ -98,7 +98,7 @@ namespace
if (t->beingAnalyzed() == false) if (t->beingAnalyzed() == false)
{ {
warning("(apator162) telegram contains a register (%02x) with unknown size.\n" warning("(apator162) telegram contains a register (%02x) with unknown size.\n"
"Please open an issue at https://github.com/weetmuts/wmbusmeters/\n" "Please open an issue at https://github.com/wmbusmeters/wmbusmeters/\n"
"and report this telegram: %s\n", c, hex.c_str()); "and report this telegram: %s\n", c, hex.c_str());
} }
break; break;

2
src/main.cc
Wyświetl plik

@ -111,7 +111,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
You can download the source here: https://github.com/weetmuts/wmbusmeters You can download the source here: https://github.com/wmbusmeters/wmbusmeters
But you can also request the source from the person/company that But you can also request the source from the person/company that
provided you with this binary. Read the full license for all details. provided you with this binary. Read the full license for all details.

4
src/metermanager.cc
Wyświetl plik

@ -122,7 +122,7 @@ public:
version); version);
warning("(meter) please consider opening an issue at https://github.com/weetmuts/wmbusmeters/\n"); warning("(meter) please consider opening an issue at https://github.com/wmbusmeters/wmbusmeters/\n");
warning("(meter) to add support for this unknown mfct,media,version combination\n"); warning("(meter) to add support for this unknown mfct,media,version combination\n");
} }
@ -226,7 +226,7 @@ public:
// Oups, we added a new meter object tailored for this telegram // Oups, we added a new meter object tailored for this telegram
// but it still did not match! This is probably an error in wmbusmeters! // but it still did not match! This is probably an error in wmbusmeters!
warning("(meter) newly created meter (%s %s %s) did not match telegram! ", warning("(meter) newly created meter (%s %s %s) did not match telegram! ",
"Please open an issue at https://github.com/weetmuts/wmbusmeters/\n", "Please open an issue at https://github.com/wmbusmeters/wmbusmeters/\n",
meter->name().c_str(), meter->idsc().c_str(), meter->driverName().str().c_str()); meter->name().c_str(), meter->idsc().c_str(), meter->driverName().str().c_str());
} }
else if (!h) else if (!h)

2
src/meters.cc
Wyświetl plik

@ -825,7 +825,7 @@ bool MeterCommonImplementation::isTelegramForMeter(Telegram *t, Meter *meter, Me
if (possible_drivers == "unknown!") if (possible_drivers == "unknown!")
{ {
warning("(meter) please consider opening an issue at https://github.com/weetmuts/wmbusmeters/\n"); warning("(meter) please consider opening an issue at https://github.com/wmbusmeters/wmbusmeters/\n");
warning("(meter) to add support for this unknown mfct,media,version combination\n"); warning("(meter) to add support for this unknown mfct,media,version combination\n");
} }
} }

8
src/wmbus_cul.cc
Wyświetl plik

@ -359,8 +359,8 @@ FrameStatus WMBusCUL::checkCULFrame(vector<uchar> &data,
if (hex.size() % 2 == 1) if (hex.size() % 2 == 1)
{ {
warning("(cul) Warning! Your cul firmware has a bug that prevents longer telegrams from being received.!\n"); warning("(cul) Warning! Your cul firmware has a bug that prevents longer telegrams from being received.!\n");
warning("(cul) Please read: https://github.com/weetmuts/wmbusmeters/issues/390\n"); warning("(cul) Please read: https://github.com/wmbusmeters/wmbusmeters/issues/390\n");
warning("(cul) and: https://weetmuts.github.io/wmbusmeterswiki/nanoCUL.html\n"); warning("(cul) and: https://wmbusmeters.github.io/wmbusmeters-wiki/nanoCUL.html\n");
} }
payload.clear(); payload.clear();
@ -395,8 +395,8 @@ FrameStatus WMBusCUL::checkCULFrame(vector<uchar> &data,
if (hex.size() % 2 == 1) if (hex.size() % 2 == 1)
{ {
warning("(cul) Warning! Your cul firmware has a bug that prevents longer telegrams from being received.!\n"); warning("(cul) Warning! Your cul firmware has a bug that prevents longer telegrams from being received.!\n");
warning("(cul) Please read: https://github.com/weetmuts/wmbusmeters/issues/390\n"); warning("(cul) Please read: https://github.com/wmbusmeters/wmbusmeters/issues/390\n");
warning("(cul) and: https://weetmuts.github.io/wmbusmeterswiki/nanoCUL.html\n"); warning("(cul) and: https://wmbusmeters.github.io/wmbusmeters-wiki/nanoCUL.html\n");
} }
payload.clear(); payload.clear();

2
tests/test_anyid.sh
Wyświetl plik

@ -51,7 +51,7 @@ TESTNAME="Test ANYID with auto but no driver found!"
cat <<EOF > $TEST/test_expected.txt cat <<EOF > $TEST/test_expected.txt
(meter) Vatten: meter detection could not find driver for id: 76348799 mfct: (KIM) Unknown (0x2d2d) type: Cold water meter (0x16) ver: 0x1b (meter) Vatten: meter detection could not find driver for id: 76348799 mfct: (KIM) Unknown (0x2d2d) type: Cold water meter (0x16) ver: 0x1b
(meter) please consider opening an issue at https://github.com/weetmuts/wmbusmeters/ (meter) please consider opening an issue at https://github.com/wmbusmeters/wmbusmeters/
(meter) to add support for this unknown mfct,media,version combination (meter) to add support for this unknown mfct,media,version combination
{"media":"cold water","meter":"auto","name":"Vatten","id":"76348799","timestamp":"1111-11-11T11:11:11Z"} {"media":"cold water","meter":"auto","name":"Vatten","id":"76348799","timestamp":"1111-11-11T11:11:11Z"}
EOF EOF

2
tests/test_unknown.sh
Wyświetl plik

@ -13,7 +13,7 @@ METERS="Dorren lansendw 00010205 NOKEY Forren lansensm 00010206 NOKEY"
cat > $TEST/test_expected.txt <<EOF cat > $TEST/test_expected.txt <<EOF
(meter) Dorren: meter detection did not match the selected driver lansendw! correct driver is: unknown! (meter) Dorren: meter detection did not match the selected driver lansendw! correct driver is: unknown!
(meter) Not printing this warning again for id: 00010205 mfct: (LAS) Lansen Systems, Sweden (0x3033) type: Unknown (0xff) ver: 0x07 (meter) Not printing this warning again for id: 00010205 mfct: (LAS) Lansen Systems, Sweden (0x3033) type: Unknown (0xff) ver: 0x07
(meter) please consider opening an issue at https://github.com/weetmuts/wmbusmeters/ (meter) please consider opening an issue at https://github.com/wmbusmeters/wmbusmeters/
(meter) to add support for this unknown mfct,media,version combination (meter) to add support for this unknown mfct,media,version combination
{"media":"Unknown","meter":"lansendw","name":"Dorren","id":"00010205","status":"OPEN","a_counter":23,"b_counter":0,"timestamp":"1111-11-11T11:11:11Z"} {"media":"Unknown","meter":"lansendw","name":"Dorren","id":"00010205","status":"OPEN","a_counter":23,"b_counter":0,"timestamp":"1111-11-11T11:11:11Z"}
(meter) Forren: meter detection did not match the selected driver lansensm! correct driver is: lansendw (meter) Forren: meter detection did not match the selected driver lansensm! correct driver is: lansendw