From 51fa1f8ae4bde645dd82dc6ce084dac8255a9391 Mon Sep 17 00:00:00 2001 From: mazocode Date: Wed, 28 Feb 2024 13:43:30 +0100 Subject: [PATCH] Feature release 2024.02.1 --- CHANGELOG.md | 15 +++++++++++++++ CONTRIBUTORS.md | 7 +++++++ Makefile | 2 +- README.md | 5 ----- modbus2mqtt.py | 1 + pyproject.toml | 2 +- 6 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 CONTRIBUTORS.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 0086bb3..030cc07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,19 @@ +## [2024.02.1] - 2024-02-28 Feature Release + +- Read input register + +- Basic support of big and little endian registers + +- Read multi-byte value in big and little endian order + +- Fix the default value of length to 1 ( as in the readme) + + +## [2023.10.6] - 2023-10-22 Bugfix Release + +- Fixed pollms was ignored + ## [2023.10.5] - 2023-10-22 Bugfix Release - Fixed missing message retain diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 0000000..7d02c76 --- /dev/null +++ b/CONTRIBUTORS.md @@ -0,0 +1,7 @@ +# Contributors + +## Special thanks for all the people who had helped this project so far: + +* [Philippe Rgaux](https://github.com/PhilippeRigaux) + + diff --git a/Makefile b/Makefile index 1c4d58b..aa78c69 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ VERSION = $(shell poetry version -s) GITHUBUSER = mazocode -ARCHS = linux/amd64 linux/arm/v6 linux/arm/v7 linux/arm64/v8 +ARCHS = linux/amd64 linux/arm linux/arm/v6 linux/arm/v7 linux/arm64/v8 null = space = $(null) $(null) diff --git a/README.md b/README.md index 1434454..e263e61 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,6 @@ This is a gateway between Modbus and MQTT. It was originally developed to read r can read from one or more Modbus TCP gateways (e.g. the Waveshare RS485 to Ethernet) simultaneously. The state of the coils can be published as a json message and their state can also be changed with a json message sent to the rpc topic. -## Changes from the upstream version -1) Read input register -2) Basic support of big and little endian registers -3) Read multi-byte value in big and little endian order -4) Fix the default value of length to 1 ( as in the readme) ## Configuration diff --git a/modbus2mqtt.py b/modbus2mqtt.py index c5e43b9..cf051b0 100755 --- a/modbus2mqtt.py +++ b/modbus2mqtt.py @@ -479,6 +479,7 @@ def main(argv): int(source.get("port", 502)), schema[source["schema"]], int(source.get("unitid", 1)), + pollms=int(source.get("pollms", 1000)), topic_prefix=source.get("topic_prefix", None), enabled=bool(source.get("enabled", True)) ) diff --git a/pyproject.toml b/pyproject.toml index 56f10a6..0fa9ae4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "modbus2mqtt" -version = "2023.10.5" +version = "2024.02.1" description = "Gateway between Modbus TCP devices and MQTT." authors = ["Marcus Zoller "] license = "MIT"