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ęć

Wyświetl plik

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

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
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.
| System | Status |
| ------------ |:-------------:|
| Ubuntu | [![Build Ubuntu Status](https://github.com/weetmuts/wmbusmeters/workflows/Build%20Ubuntu/badge.svg)](https://github.com/weetmuts/wmbusmeters/actions)|
| MacOSX | [![Build MacOSX Status](https://github.com/weetmuts/wmbusmeters/workflows/Build%20MacOSX/badge.svg)](https://github.com/weetmuts/wmbusmeters/actions)|
| Docker | [![Build Docker Status](https://github.com/weetmuts/wmbusmeters/workflows/Build%20docker/badge.svg)](https://hub.docker.com/r/weetmuts/wmbusmeters/)|
| Snap | [![Build Snap Status](https://github.com/weetmuts/wmbusmeters/workflows/Build%20Snap/badge.svg)](https://snapcraft.io/wmbusmeters)|
| 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/wmbusmeters/wmbusmeters/workflows/Build%20MacOSX/badge.svg)](https://github.com/wmbusmeters/wmbusmeters/actions)|
| 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/wmbusmeters/wmbusmeters/workflows/Build%20Snap/badge.svg)](https://snapcraft.io/wmbusmeters)|
# Distributions
@ -29,12 +29,12 @@ Availability of **wmbusmeters** for other Linux distributions can be checked on
# 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
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

6
configure vendored
Wyświetl plik

@ -583,7 +583,7 @@ PACKAGE_TARNAME='wmbusmeters'
PACKAGE_VERSION='wmbusmeters'
PACKAGE_STRING='wmbusmeters wmbusmeters'
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.
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.
Report bugs to <oehrstroem@gmail.com>.
wmbusmeters home page: <https://github.com/weetmuts/wmbusmeters>.
wmbusmeters home page: <https://github.com/wmbusmeters/wmbusmeters>.
_ACEOF
ac_status=$?
fi
@ -3988,7 +3988,7 @@ Configuration files:
$config_files
Report bugs to <oehrstroem@gmail.com>.
wmbusmeters home page: <https://github.com/weetmuts/wmbusmeters>."
wmbusmeters home page: <https://github.com/wmbusmeters/wmbusmeters>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

Wyświetl plik

@ -15,7 +15,7 @@
#
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_CANONICAL_BUILD

Wyświetl plik

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

Wyświetl plik

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

Wyświetl plik

@ -4,5 +4,5 @@
version=4
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

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!
(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
(meter) ABOGGLKZ: yes for me
(meter) ABOGGLKZ eurisii handling telegram from 60900126

Wyświetl plik

@ -1,6 +1,6 @@
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 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/merbanan/rtl_433.git
WORKDIR /wmbusmeters

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
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
- ARMv7 32-bit (`armv7`)
@ -22,7 +22,7 @@ docker run -d --privileged \
-v /etc/localtime:/etc/localtime:ro \
-v /opt/wmbusmeters:/wmbusmeters_data \
-v /dev/:/dev/ \
weetmuts/wmbusmeters
wmbusmeters/wmbusmeters
```
### 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"
services:
wmbusmeters:
image: weetmuts/wmbusmeters
image: wmbusmeters/wmbusmeters
container_name: wmbusmeters
restart: always
volumes:
@ -48,7 +48,7 @@ services:
- /etc/localtime:/etc/localtime:ro
- /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
@ -73,7 +73,7 @@ docker run -d \
-v /etc/localtime:/etc/localtime:ro \
-v /opt/wmbusmeters:/wmbusmeters_data \
--device=/dev/im871a \
weetmuts/wmbusmeters
wmbusmeters/wmbusmeters
```
### 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"
services:
wmbusmeters:
image: weetmuts/wmbusmeters
image: wmbusmeters/wmbusmeters
container_name: wmbusmeters
restart: always
volumes:
@ -101,8 +101,8 @@ services:
- /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
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)

Wyświetl plik

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

Wyświetl plik

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

Wyświetl plik

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

Wyświetl plik

@ -98,7 +98,7 @@ namespace
if (t->beingAnalyzed() == false)
{
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());
}
break;

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
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
provided you with this binary. Read the full license for all details.

Wyświetl plik

@ -122,7 +122,7 @@ public:
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");
}
@ -226,7 +226,7 @@ public:
// Oups, we added a new meter object tailored for this telegram
// 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! ",
"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());
}
else if (!h)

Wyświetl plik

@ -825,7 +825,7 @@ bool MeterCommonImplementation::isTelegramForMeter(Telegram *t, Meter *meter, Me
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");
}
}

Wyświetl plik

@ -359,8 +359,8 @@ FrameStatus WMBusCUL::checkCULFrame(vector<uchar> &data,
if (hex.size() % 2 == 1)
{
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) and: https://weetmuts.github.io/wmbusmeterswiki/nanoCUL.html\n");
warning("(cul) Please read: https://github.com/wmbusmeters/wmbusmeters/issues/390\n");
warning("(cul) and: https://wmbusmeters.github.io/wmbusmeters-wiki/nanoCUL.html\n");
}
payload.clear();
@ -395,8 +395,8 @@ FrameStatus WMBusCUL::checkCULFrame(vector<uchar> &data,
if (hex.size() % 2 == 1)
{
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) and: https://weetmuts.github.io/wmbusmeterswiki/nanoCUL.html\n");
warning("(cul) Please read: https://github.com/wmbusmeters/wmbusmeters/issues/390\n");
warning("(cul) and: https://wmbusmeters.github.io/wmbusmeters-wiki/nanoCUL.html\n");
}
payload.clear();

Wyświetl plik

@ -51,7 +51,7 @@ TESTNAME="Test ANYID with auto but no driver found!"
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) 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
{"media":"cold water","meter":"auto","name":"Vatten","id":"76348799","timestamp":"1111-11-11T11:11:11Z"}
EOF

Wyświetl plik

@ -13,7 +13,7 @@ METERS="Dorren lansendw 00010205 NOKEY Forren lansensm 00010206 NOKEY"
cat > $TEST/test_expected.txt <<EOF
(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) 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
{"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