ecowitt-modbus 0.2.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- ecowitt_modbus-0.2.0/.github/workflows/ci.yml +52 -0
- ecowitt_modbus-0.2.0/.github/workflows/enforce-develop.yml +32 -0
- ecowitt_modbus-0.2.0/.github/workflows/publish.yml +34 -0
- ecowitt_modbus-0.2.0/.gitignore +11 -0
- ecowitt_modbus-0.2.0/.pre-commit-config.yaml +9 -0
- ecowitt_modbus-0.2.0/LICENSE +202 -0
- ecowitt_modbus-0.2.0/PKG-INFO +122 -0
- ecowitt_modbus-0.2.0/README.md +105 -0
- ecowitt_modbus-0.2.0/pyproject.toml +53 -0
- ecowitt_modbus-0.2.0/script/format_code.sh +25 -0
- ecowitt_modbus-0.2.0/script/query.py +114 -0
- ecowitt_modbus-0.2.0/script/run_checks.sh +52 -0
- ecowitt_modbus-0.2.0/src/ecowitt_modbus/__init__.py +43 -0
- ecowitt_modbus-0.2.0/src/ecowitt_modbus/const.py +30 -0
- ecowitt_modbus-0.2.0/src/ecowitt_modbus/device.py +108 -0
- ecowitt_modbus-0.2.0/src/ecowitt_modbus/py.typed +0 -0
- ecowitt_modbus-0.2.0/src/ecowitt_modbus/testing.py +60 -0
- ecowitt_modbus-0.2.0/src/ecowitt_modbus/wn69lp/__init__.py +15 -0
- ecowitt_modbus-0.2.0/src/ecowitt_modbus/wn69lp/device_info.py +64 -0
- ecowitt_modbus-0.2.0/src/ecowitt_modbus/wn69lp/sensors.py +59 -0
- ecowitt_modbus-0.2.0/src/ecowitt_modbus/wn69lp/wn69lp.py +113 -0
- ecowitt_modbus-0.2.0/src/ecowitt_modbus/ws90/__init__.py +16 -0
- ecowitt_modbus-0.2.0/src/ecowitt_modbus/ws90/device_info.py +35 -0
- ecowitt_modbus-0.2.0/src/ecowitt_modbus/ws90/history.py +119 -0
- ecowitt_modbus-0.2.0/src/ecowitt_modbus/ws90/sensors.py +37 -0
- ecowitt_modbus-0.2.0/src/ecowitt_modbus/ws90/ws90.py +84 -0
- ecowitt_modbus-0.2.0/tests/__init__.py +0 -0
- ecowitt_modbus-0.2.0/tests/conftest.py +43 -0
- ecowitt_modbus-0.2.0/tests/test_supported_models.py +105 -0
- ecowitt_modbus-0.2.0/tests/wn69lp/__init__.py +0 -0
- ecowitt_modbus-0.2.0/tests/wn69lp/test_device_info.py +80 -0
- ecowitt_modbus-0.2.0/tests/wn69lp/test_sensors.py +117 -0
- ecowitt_modbus-0.2.0/tests/wn69lp/test_wn69lp.py +126 -0
- ecowitt_modbus-0.2.0/tests/ws90/__init__.py +0 -0
- ecowitt_modbus-0.2.0/tests/ws90/test_device_info.py +39 -0
- ecowitt_modbus-0.2.0/tests/ws90/test_history.py +49 -0
- ecowitt_modbus-0.2.0/tests/ws90/test_sensors.py +29 -0
- ecowitt_modbus-0.2.0/tests/ws90/test_ws90.py +83 -0
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
name: CI
|
|
2
|
+
|
|
3
|
+
on:
|
|
4
|
+
push:
|
|
5
|
+
branches:
|
|
6
|
+
- develop
|
|
7
|
+
- main
|
|
8
|
+
pull_request:
|
|
9
|
+
branches:
|
|
10
|
+
- develop
|
|
11
|
+
|
|
12
|
+
permissions:
|
|
13
|
+
contents: read
|
|
14
|
+
|
|
15
|
+
jobs:
|
|
16
|
+
quality:
|
|
17
|
+
name: Quality checks
|
|
18
|
+
runs-on: ubuntu-latest
|
|
19
|
+
|
|
20
|
+
steps:
|
|
21
|
+
- name: Check out repository
|
|
22
|
+
uses: actions/checkout@v6
|
|
23
|
+
|
|
24
|
+
- name: Set up Python
|
|
25
|
+
uses: actions/setup-python@v6
|
|
26
|
+
with:
|
|
27
|
+
python-version: "3.13"
|
|
28
|
+
|
|
29
|
+
- name: Install package and test tools
|
|
30
|
+
run: |
|
|
31
|
+
python -m pip install --upgrade pip
|
|
32
|
+
python -m pip install -e .
|
|
33
|
+
python -m pip install \
|
|
34
|
+
"pytest>=8,<10" \
|
|
35
|
+
"pytest-asyncio>=0.24,<2" \
|
|
36
|
+
"ruff==0.15.22" \
|
|
37
|
+
"build>=1,<2"
|
|
38
|
+
|
|
39
|
+
- name: Check formatting
|
|
40
|
+
run: python -m ruff format --check .
|
|
41
|
+
|
|
42
|
+
- name: Run Ruff
|
|
43
|
+
run: python -m ruff check .
|
|
44
|
+
|
|
45
|
+
- name: Compile sources
|
|
46
|
+
run: python -m compileall -q src tests
|
|
47
|
+
|
|
48
|
+
- name: Run tests
|
|
49
|
+
run: python -m pytest
|
|
50
|
+
|
|
51
|
+
- name: Build package
|
|
52
|
+
run: python -m build
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
name: Reject PRs to main
|
|
2
|
+
|
|
3
|
+
on:
|
|
4
|
+
pull_request:
|
|
5
|
+
branches:
|
|
6
|
+
- main
|
|
7
|
+
types:
|
|
8
|
+
- opened
|
|
9
|
+
- edited
|
|
10
|
+
- synchronize
|
|
11
|
+
- reopened
|
|
12
|
+
- ready_for_review
|
|
13
|
+
|
|
14
|
+
permissions:
|
|
15
|
+
contents: read
|
|
16
|
+
|
|
17
|
+
jobs:
|
|
18
|
+
guard:
|
|
19
|
+
name: Only develop may target main
|
|
20
|
+
runs-on: ubuntu-latest
|
|
21
|
+
|
|
22
|
+
steps:
|
|
23
|
+
- name: Block PRs to main unless the source is local develop
|
|
24
|
+
if: >-
|
|
25
|
+
${{
|
|
26
|
+
github.event.pull_request.head.ref != 'develop' ||
|
|
27
|
+
github.event.pull_request.head.repo.full_name != github.repository
|
|
28
|
+
}}
|
|
29
|
+
run: |
|
|
30
|
+
echo "❌ PRs to :main can only be created from the local :develop branch."
|
|
31
|
+
echo "Please create the PR against :develop instead."
|
|
32
|
+
exit 1
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
name: Publish to PyPI
|
|
2
|
+
|
|
3
|
+
on:
|
|
4
|
+
release:
|
|
5
|
+
types: [published]
|
|
6
|
+
|
|
7
|
+
jobs:
|
|
8
|
+
build:
|
|
9
|
+
runs-on: ubuntu-latest
|
|
10
|
+
steps:
|
|
11
|
+
- uses: actions/checkout@v4
|
|
12
|
+
- uses: astral-sh/setup-uv@v6
|
|
13
|
+
- name: Set package version from release tag
|
|
14
|
+
env:
|
|
15
|
+
RELEASE_TAG: ${{ github.event.release.tag_name }}
|
|
16
|
+
run: sed -i "s/^version = \"0\\.0\\.0\"$/version = \"${RELEASE_TAG}\"/" pyproject.toml
|
|
17
|
+
- run: uv build
|
|
18
|
+
- uses: actions/upload-artifact@v4
|
|
19
|
+
with:
|
|
20
|
+
name: dist
|
|
21
|
+
path: dist/
|
|
22
|
+
|
|
23
|
+
publish:
|
|
24
|
+
needs: build
|
|
25
|
+
runs-on: ubuntu-latest
|
|
26
|
+
environment: pypi
|
|
27
|
+
permissions:
|
|
28
|
+
id-token: write
|
|
29
|
+
steps:
|
|
30
|
+
- uses: actions/download-artifact@v4
|
|
31
|
+
with:
|
|
32
|
+
name: dist
|
|
33
|
+
path: dist/
|
|
34
|
+
- uses: pypa/gh-action-pypi-publish@release/v1
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
# Run with prek (https://github.com/j178/prek): `prek install` then commits are
|
|
2
|
+
# auto-formatted; `prek run --all-files` to check everything.
|
|
3
|
+
repos:
|
|
4
|
+
- repo: https://github.com/astral-sh/ruff-pre-commit
|
|
5
|
+
rev: v0.15.18
|
|
6
|
+
hooks:
|
|
7
|
+
- id: ruff-format
|
|
8
|
+
- id: ruff-check
|
|
9
|
+
args: [--fix]
|
|
@@ -0,0 +1,202 @@
|
|
|
1
|
+
|
|
2
|
+
Apache License
|
|
3
|
+
Version 2.0, January 2004
|
|
4
|
+
http://www.apache.org/licenses/
|
|
5
|
+
|
|
6
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
7
|
+
|
|
8
|
+
1. Definitions.
|
|
9
|
+
|
|
10
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
|
11
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
|
12
|
+
|
|
13
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
|
14
|
+
the copyright owner that is granting the License.
|
|
15
|
+
|
|
16
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
|
17
|
+
other entities that control, are controlled by, or are under common
|
|
18
|
+
control with that entity. For the purposes of this definition,
|
|
19
|
+
"control" means (i) the power, direct or indirect, to cause the
|
|
20
|
+
direction or management of such entity, whether by contract or
|
|
21
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
22
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
23
|
+
|
|
24
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
|
25
|
+
exercising permissions granted by this License.
|
|
26
|
+
|
|
27
|
+
"Source" form shall mean the preferred form for making modifications,
|
|
28
|
+
including but not limited to software source code, documentation
|
|
29
|
+
source, and configuration files.
|
|
30
|
+
|
|
31
|
+
"Object" form shall mean any form resulting from mechanical
|
|
32
|
+
transformation or translation of a Source form, including but
|
|
33
|
+
not limited to compiled object code, generated documentation,
|
|
34
|
+
and conversions to other media types.
|
|
35
|
+
|
|
36
|
+
"Work" shall mean the work of authorship, whether in Source or
|
|
37
|
+
Object form, made available under the License, as indicated by a
|
|
38
|
+
copyright notice that is included in or attached to the work
|
|
39
|
+
(an example is provided in the Appendix below).
|
|
40
|
+
|
|
41
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
|
42
|
+
form, that is based on (or derived from) the Work and for which the
|
|
43
|
+
editorial revisions, annotations, elaborations, or other modifications
|
|
44
|
+
represent, as a whole, an original work of authorship. For the purposes
|
|
45
|
+
of this License, Derivative Works shall not include works that remain
|
|
46
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
|
47
|
+
the Work and Derivative Works thereof.
|
|
48
|
+
|
|
49
|
+
"Contribution" shall mean any work of authorship, including
|
|
50
|
+
the original version of the Work and any modifications or additions
|
|
51
|
+
to that Work or Derivative Works thereof, that is intentionally
|
|
52
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
53
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
|
54
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
|
55
|
+
means any form of electronic, verbal, or written communication sent
|
|
56
|
+
to the Licensor or its representatives, including but not limited to
|
|
57
|
+
communication on electronic mailing lists, source code control systems,
|
|
58
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
|
59
|
+
Licensor for the purpose of discussing and improving the Work, but
|
|
60
|
+
excluding communication that is conspicuously marked or otherwise
|
|
61
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
|
62
|
+
|
|
63
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
64
|
+
on behalf of whom a Contribution has been received by Licensor and
|
|
65
|
+
subsequently incorporated within the Work.
|
|
66
|
+
|
|
67
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
68
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
69
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
70
|
+
copyright license to reproduce, prepare Derivative Works of,
|
|
71
|
+
publicly display, publicly perform, sublicense, and distribute the
|
|
72
|
+
Work and such Derivative Works in Source or Object form.
|
|
73
|
+
|
|
74
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
|
75
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
76
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
77
|
+
(except as stated in this section) patent license to make, have made,
|
|
78
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
79
|
+
where such license applies only to those patent claims licensable
|
|
80
|
+
by such Contributor that are necessarily infringed by their
|
|
81
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
|
82
|
+
with the Work to which such Contribution(s) was submitted. If You
|
|
83
|
+
institute patent litigation against any entity (including a
|
|
84
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
85
|
+
or a Contribution incorporated within the Work constitutes direct
|
|
86
|
+
or contributory patent infringement, then any patent licenses
|
|
87
|
+
granted to You under this License for that Work shall terminate
|
|
88
|
+
as of the date such litigation is filed.
|
|
89
|
+
|
|
90
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
|
91
|
+
Work or Derivative Works thereof in any medium, with or without
|
|
92
|
+
modifications, and in Source or Object form, provided that You
|
|
93
|
+
meet the following conditions:
|
|
94
|
+
|
|
95
|
+
(a) You must give any other recipients of the Work or
|
|
96
|
+
Derivative Works a copy of this License; and
|
|
97
|
+
|
|
98
|
+
(b) You must cause any modified files to carry prominent notices
|
|
99
|
+
stating that You changed the files; and
|
|
100
|
+
|
|
101
|
+
(c) You must retain, in the Source form of any Derivative Works
|
|
102
|
+
that You distribute, all copyright, patent, trademark, and
|
|
103
|
+
attribution notices from the Source form of the Work,
|
|
104
|
+
excluding those notices that do not pertain to any part of
|
|
105
|
+
the Derivative Works; and
|
|
106
|
+
|
|
107
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
|
108
|
+
distribution, then any Derivative Works that You distribute must
|
|
109
|
+
include a readable copy of the attribution notices contained
|
|
110
|
+
within such NOTICE file, excluding those notices that do not
|
|
111
|
+
pertain to any part of the Derivative Works, in at least one
|
|
112
|
+
of the following places: within a NOTICE text file distributed
|
|
113
|
+
as part of the Derivative Works; within the Source form or
|
|
114
|
+
documentation, if provided along with the Derivative Works; or,
|
|
115
|
+
within a display generated by the Derivative Works, if and
|
|
116
|
+
wherever such third-party notices normally appear. The contents
|
|
117
|
+
of the NOTICE file are for informational purposes only and
|
|
118
|
+
do not modify the License. You may add Your own attribution
|
|
119
|
+
notices within Derivative Works that You distribute, alongside
|
|
120
|
+
or as an addendum to the NOTICE text from the Work, provided
|
|
121
|
+
that such additional attribution notices cannot be construed
|
|
122
|
+
as modifying the License.
|
|
123
|
+
|
|
124
|
+
You may add Your own copyright statement to Your modifications and
|
|
125
|
+
may provide additional or different license terms and conditions
|
|
126
|
+
for use, reproduction, or distribution of Your modifications, or
|
|
127
|
+
for any such Derivative Works as a whole, provided Your use,
|
|
128
|
+
reproduction, and distribution of the Work otherwise complies with
|
|
129
|
+
the conditions stated in this License.
|
|
130
|
+
|
|
131
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
132
|
+
any Contribution intentionally submitted for inclusion in the Work
|
|
133
|
+
by You to the Licensor shall be under the terms and conditions of
|
|
134
|
+
this License, without any additional terms or conditions.
|
|
135
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
|
136
|
+
the terms of any separate license agreement you may have executed
|
|
137
|
+
with Licensor regarding such Contributions.
|
|
138
|
+
|
|
139
|
+
6. Trademarks. This License does not grant permission to use the trade
|
|
140
|
+
names, trademarks, service marks, or product names of the Licensor,
|
|
141
|
+
except as required for reasonable and customary use in describing the
|
|
142
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
|
143
|
+
|
|
144
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
145
|
+
agreed to in writing, Licensor provides the Work (and each
|
|
146
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
147
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
148
|
+
implied, including, without limitation, any warranties or conditions
|
|
149
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
150
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
151
|
+
appropriateness of using or redistributing the Work and assume any
|
|
152
|
+
risks associated with Your exercise of permissions under this License.
|
|
153
|
+
|
|
154
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
|
155
|
+
whether in tort (including negligence), contract, or otherwise,
|
|
156
|
+
unless required by applicable law (such as deliberate and grossly
|
|
157
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
|
158
|
+
liable to You for damages, including any direct, indirect, special,
|
|
159
|
+
incidental, or consequential damages of any character arising as a
|
|
160
|
+
result of this License or out of the use or inability to use the
|
|
161
|
+
Work (including but not limited to damages for loss of goodwill,
|
|
162
|
+
work stoppage, computer failure or malfunction, or any and all
|
|
163
|
+
other commercial damages or losses), even if such Contributor
|
|
164
|
+
has been advised of the possibility of such damages.
|
|
165
|
+
|
|
166
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
|
167
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
|
168
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
169
|
+
or other liability obligations and/or rights consistent with this
|
|
170
|
+
License. However, in accepting such obligations, You may act only
|
|
171
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
|
172
|
+
of any other Contributor, and only if You agree to indemnify,
|
|
173
|
+
defend, and hold each Contributor harmless for any liability
|
|
174
|
+
incurred by, or claims asserted against, such Contributor by reason
|
|
175
|
+
of your accepting any such warranty or additional liability.
|
|
176
|
+
|
|
177
|
+
END OF TERMS AND CONDITIONS
|
|
178
|
+
|
|
179
|
+
APPENDIX: How to apply the Apache License to your work.
|
|
180
|
+
|
|
181
|
+
To apply the Apache License to your work, attach the following
|
|
182
|
+
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
183
|
+
replaced with your own identifying information. (Don't include
|
|
184
|
+
the brackets!) The text should be enclosed in the appropriate
|
|
185
|
+
comment syntax for the file format. We also recommend that a
|
|
186
|
+
file or class name and description of purpose be included on the
|
|
187
|
+
same "printed page" as the copyright notice for easier
|
|
188
|
+
identification within third-party archives.
|
|
189
|
+
|
|
190
|
+
Copyright [yyyy] [name of copyright owner]
|
|
191
|
+
|
|
192
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
193
|
+
you may not use this file except in compliance with the License.
|
|
194
|
+
You may obtain a copy of the License at
|
|
195
|
+
|
|
196
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
197
|
+
|
|
198
|
+
Unless required by applicable law or agreed to in writing, software
|
|
199
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
200
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
201
|
+
See the License for the specific language governing permissions and
|
|
202
|
+
limitations under the License.
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
Metadata-Version: 2.5
|
|
2
|
+
Name: ecowitt-modbus
|
|
3
|
+
Version: 0.2.0
|
|
4
|
+
Summary: Read Fine Offset / Ecowitt weather sensors over Modbus.
|
|
5
|
+
Project-URL: Homepage, https://github.com/iainchesworth/ecowitt-modbus
|
|
6
|
+
Author: ecowitt-modbus contributors
|
|
7
|
+
License: Apache-2.0
|
|
8
|
+
License-File: LICENSE
|
|
9
|
+
Keywords: ecowitt,fine-offset,home-assistant,modbus,weather,wn69lp,ws90
|
|
10
|
+
Classifier: Programming Language :: Python :: 3
|
|
11
|
+
Classifier: Topic :: Home Automation
|
|
12
|
+
Requires-Python: >=3.12
|
|
13
|
+
Requires-Dist: modbus-connection<5,>=4.8.1
|
|
14
|
+
Provides-Extra: cli
|
|
15
|
+
Requires-Dist: modbus-connection[tmodbus]<5,>=4.8.1; extra == 'cli'
|
|
16
|
+
Description-Content-Type: text/markdown
|
|
17
|
+
|
|
18
|
+
# `ecowitt-modbus` Python library
|
|
19
|
+
|
|
20
|
+
[](https://github.com/iainchesworth/ecowitt-modbus/actions/workflows/ci.yml)
|
|
21
|
+
[](https://pypi.org/project/ecowitt-modbus/)
|
|
22
|
+
[](https://pypi.org/project/ecowitt-modbus/)
|
|
23
|
+
[](LICENSE)
|
|
24
|
+
|
|
25
|
+
`ecowitt-modbus` is an asynchronous, transport-independent Python library for communicating with **Fine Offset / Ecowitt** weather sensors over Modbus RTU (including RTU-over-TCP, the common way these sensors are bridged onto a network).
|
|
26
|
+
|
|
27
|
+
The library was developed as the backend for a corresponding Home Assistant integration. As it is kept independent of Home Assistant, it can also be used by other Python applications and projects.
|
|
28
|
+
|
|
29
|
+
## Supported devices
|
|
30
|
+
|
|
31
|
+
| Device | Specification | Default address | Comments |
|
|
32
|
+
| :----- | :------------ | :-------------- | :------- |
|
|
33
|
+
| Fine Offset / Ecowitt WS90 | Modbus RTU V1.0.6 | `0x90` (144) | All-in-one weather sensor array with no moving parts (light, UV, temperature, humidity, wind, rain, pressure) |
|
|
34
|
+
| Fine Offset / Ecowitt WN69LP | Modbus RTU V1.0.2 | `0x24` (36) | Wired RS485 7-in-1 sensor array with a mechanical anemometer and tipping-bucket rain gauge |
|
|
35
|
+
|
|
36
|
+
The two devices share almost no register layout. They are modelled separately and only present a common interface, not common internals.
|
|
37
|
+
|
|
38
|
+
## Usage
|
|
39
|
+
|
|
40
|
+
Construct the model you have with a [`modbus_connection.ModbusUnit`](https://github.com/home-assistant-libs/modbus-connection), confirm the right device answered, then poll it:
|
|
41
|
+
|
|
42
|
+
```python
|
|
43
|
+
from ecowitt_modbus import WS90
|
|
44
|
+
|
|
45
|
+
device = WS90(unit)
|
|
46
|
+
await device.async_probe()
|
|
47
|
+
await device.async_update()
|
|
48
|
+
|
|
49
|
+
print(device.sensors.temperature) # 26.2
|
|
50
|
+
print(device.sensors.wind_speed) # 1.2
|
|
51
|
+
```
|
|
52
|
+
|
|
53
|
+
An application that lets a user pick the model can look the class up by name instead of branching:
|
|
54
|
+
|
|
55
|
+
```python
|
|
56
|
+
from ecowitt_modbus import SUPPORTED_MODELS
|
|
57
|
+
|
|
58
|
+
device = SUPPORTED_MODELS["WN69LP"](unit)
|
|
59
|
+
```
|
|
60
|
+
|
|
61
|
+
`async_probe()` raises `NotThisDeviceError` when something answers but is not the model asked for. How much it can confirm depends on the device — see [Identifying a device](#identifying-a-device) below.
|
|
62
|
+
|
|
63
|
+
## Data provided by the library
|
|
64
|
+
|
|
65
|
+
Every supported model reports light, UV index, temperature, humidity, wind speed, gust speed, wind direction, rainfall, and absolute pressure. Beyond that they differ:
|
|
66
|
+
|
|
67
|
+
| | WS90 | WN69LP |
|
|
68
|
+
| :-- | :--- | :----- |
|
|
69
|
+
| Rainfall resolution | 0.1mm, plus a 0.01mm counter | 0.254mm (0.01in tipping bucket) |
|
|
70
|
+
| UV index encoding | tenths | whole numbers |
|
|
71
|
+
| Battery / supply voltage | archived history only | live registers |
|
|
72
|
+
| 30-minute rolling history | yes, 11 parameters at one sample per minute | no |
|
|
73
|
+
| Recent-rainfall register | no | yes |
|
|
74
|
+
| Firmware version | not reported | reported (specification V1.0.2 and later) |
|
|
75
|
+
|
|
76
|
+
Both models also expose their RS-485 settings, and accept validated writes to the two settable identity registers (baud rate and device address).
|
|
77
|
+
|
|
78
|
+
The WS90's history block is 330 registers wide and changes once a minute, so it is polled separately from the live readings:
|
|
79
|
+
|
|
80
|
+
```python
|
|
81
|
+
await device.async_update_history()
|
|
82
|
+
print(device.history.battery_voltage)
|
|
83
|
+
```
|
|
84
|
+
|
|
85
|
+
### Identifying a device
|
|
86
|
+
|
|
87
|
+
The two models differ in how confidently a caller can tell what it is talking to, which matters for any application that needs to recognise a device again later:
|
|
88
|
+
|
|
89
|
+
- The **WS90** reports a fixed device code and a 32-bit device ID. `async_probe()` is a positive identification, and `device.serial_number` is stable across changes of host, port, and device address.
|
|
90
|
+
- The **WN69LP** reports neither. `device.serial_number` is always `None`, and `async_probe()` can only reject a responder whose readings fall outside the physical ranges the specification documents (for example over 100% humidity). That rules out most unrelated devices, but it cannot distinguish a WN69LP from another device whose registers happen to decode plausibly at the same addresses.
|
|
91
|
+
|
|
92
|
+
## Scope
|
|
93
|
+
|
|
94
|
+
The library reads live weather readings, RS-485 communication settings, and — on the WS90 — the 30-minute rolling history the sensor archives internally.
|
|
95
|
+
|
|
96
|
+
It does not implement:
|
|
97
|
+
|
|
98
|
+
- the WS90's "on-demand measurement" command registers (`0x9C92`-`0x9C9A`), which duplicate the live readings with tighter timing at the cost of a write-then-wait-then-read sequence,
|
|
99
|
+
- the WN69LP's automatic reporting mode (register `0x162`), which has the device push readings unprompted rather than answer polls,
|
|
100
|
+
- either device's write-only command registers (rainfall reset, software reset),
|
|
101
|
+
- the recovery command that reads or sets the baud rate and address when they are unknown, which is a non-Modbus framed exchange.
|
|
102
|
+
|
|
103
|
+
The library does **not** create or own the Modbus transport. Applications provide a [`modbus_connection.ModbusUnit`](https://github.com/home-assistant-libs/modbus-connection) and may use any backend `modbus-connection` supports (pymodbus, tmodbus, ...).
|
|
104
|
+
|
|
105
|
+
## Testing and validation
|
|
106
|
+
|
|
107
|
+
Decode logic (scale, offset, and invalid-value handling) is cross-checked against the manufacturers' own worked examples in the WS90 Modbus RTU V1.0.6 and WN69LP Modbus RTU V1.0.2 specifications. The WS90 model is additionally verified against a live sensor.
|
|
108
|
+
|
|
109
|
+
Software tests run against an in-memory mock Modbus backend (via `modbus-connection`'s pytest plugin) — no real device or server is needed to run the test suite. The register images those tests use are exported as `ecowitt_modbus.testing` so consuming applications can reuse them.
|
|
110
|
+
|
|
111
|
+
## Documentation, development and contribution guidelines
|
|
112
|
+
|
|
113
|
+
Run `script/run_checks.sh` before opening a pull request — it mirrors the CI workflow (formatting, lint, compile, tests, build) in one command. `script/format_code.sh` applies formatting and safe lint fixes only. `script/query.py` is a standalone CLI for querying a real sensor over TCP or serial; run it with `--help` for usage.
|
|
114
|
+
|
|
115
|
+
Contributions target the `develop` branch; `main` only ever receives fast-forwards from `develop` (enforced in CI).
|
|
116
|
+
|
|
117
|
+
## Related projects
|
|
118
|
+
|
|
119
|
+
This library is one of three repositories for Ecowitt Modbus support in Home Assistant:
|
|
120
|
+
|
|
121
|
+
* [`ha-ecowitt-modbus`](https://github.com/iainchesworth/ha-ecowitt-modbus) — a HACS-installable custom integration, vendoring this library.
|
|
122
|
+
* [`ha-core-ws90`](https://github.com/iainchesworth/ha-core-ws90) — a `home-assistant/core` fork adding this as a built-in integration (branch `ecowitt-ws90-integration`).
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
# `ecowitt-modbus` Python library
|
|
2
|
+
|
|
3
|
+
[](https://github.com/iainchesworth/ecowitt-modbus/actions/workflows/ci.yml)
|
|
4
|
+
[](https://pypi.org/project/ecowitt-modbus/)
|
|
5
|
+
[](https://pypi.org/project/ecowitt-modbus/)
|
|
6
|
+
[](LICENSE)
|
|
7
|
+
|
|
8
|
+
`ecowitt-modbus` is an asynchronous, transport-independent Python library for communicating with **Fine Offset / Ecowitt** weather sensors over Modbus RTU (including RTU-over-TCP, the common way these sensors are bridged onto a network).
|
|
9
|
+
|
|
10
|
+
The library was developed as the backend for a corresponding Home Assistant integration. As it is kept independent of Home Assistant, it can also be used by other Python applications and projects.
|
|
11
|
+
|
|
12
|
+
## Supported devices
|
|
13
|
+
|
|
14
|
+
| Device | Specification | Default address | Comments |
|
|
15
|
+
| :----- | :------------ | :-------------- | :------- |
|
|
16
|
+
| Fine Offset / Ecowitt WS90 | Modbus RTU V1.0.6 | `0x90` (144) | All-in-one weather sensor array with no moving parts (light, UV, temperature, humidity, wind, rain, pressure) |
|
|
17
|
+
| Fine Offset / Ecowitt WN69LP | Modbus RTU V1.0.2 | `0x24` (36) | Wired RS485 7-in-1 sensor array with a mechanical anemometer and tipping-bucket rain gauge |
|
|
18
|
+
|
|
19
|
+
The two devices share almost no register layout. They are modelled separately and only present a common interface, not common internals.
|
|
20
|
+
|
|
21
|
+
## Usage
|
|
22
|
+
|
|
23
|
+
Construct the model you have with a [`modbus_connection.ModbusUnit`](https://github.com/home-assistant-libs/modbus-connection), confirm the right device answered, then poll it:
|
|
24
|
+
|
|
25
|
+
```python
|
|
26
|
+
from ecowitt_modbus import WS90
|
|
27
|
+
|
|
28
|
+
device = WS90(unit)
|
|
29
|
+
await device.async_probe()
|
|
30
|
+
await device.async_update()
|
|
31
|
+
|
|
32
|
+
print(device.sensors.temperature) # 26.2
|
|
33
|
+
print(device.sensors.wind_speed) # 1.2
|
|
34
|
+
```
|
|
35
|
+
|
|
36
|
+
An application that lets a user pick the model can look the class up by name instead of branching:
|
|
37
|
+
|
|
38
|
+
```python
|
|
39
|
+
from ecowitt_modbus import SUPPORTED_MODELS
|
|
40
|
+
|
|
41
|
+
device = SUPPORTED_MODELS["WN69LP"](unit)
|
|
42
|
+
```
|
|
43
|
+
|
|
44
|
+
`async_probe()` raises `NotThisDeviceError` when something answers but is not the model asked for. How much it can confirm depends on the device — see [Identifying a device](#identifying-a-device) below.
|
|
45
|
+
|
|
46
|
+
## Data provided by the library
|
|
47
|
+
|
|
48
|
+
Every supported model reports light, UV index, temperature, humidity, wind speed, gust speed, wind direction, rainfall, and absolute pressure. Beyond that they differ:
|
|
49
|
+
|
|
50
|
+
| | WS90 | WN69LP |
|
|
51
|
+
| :-- | :--- | :----- |
|
|
52
|
+
| Rainfall resolution | 0.1mm, plus a 0.01mm counter | 0.254mm (0.01in tipping bucket) |
|
|
53
|
+
| UV index encoding | tenths | whole numbers |
|
|
54
|
+
| Battery / supply voltage | archived history only | live registers |
|
|
55
|
+
| 30-minute rolling history | yes, 11 parameters at one sample per minute | no |
|
|
56
|
+
| Recent-rainfall register | no | yes |
|
|
57
|
+
| Firmware version | not reported | reported (specification V1.0.2 and later) |
|
|
58
|
+
|
|
59
|
+
Both models also expose their RS-485 settings, and accept validated writes to the two settable identity registers (baud rate and device address).
|
|
60
|
+
|
|
61
|
+
The WS90's history block is 330 registers wide and changes once a minute, so it is polled separately from the live readings:
|
|
62
|
+
|
|
63
|
+
```python
|
|
64
|
+
await device.async_update_history()
|
|
65
|
+
print(device.history.battery_voltage)
|
|
66
|
+
```
|
|
67
|
+
|
|
68
|
+
### Identifying a device
|
|
69
|
+
|
|
70
|
+
The two models differ in how confidently a caller can tell what it is talking to, which matters for any application that needs to recognise a device again later:
|
|
71
|
+
|
|
72
|
+
- The **WS90** reports a fixed device code and a 32-bit device ID. `async_probe()` is a positive identification, and `device.serial_number` is stable across changes of host, port, and device address.
|
|
73
|
+
- The **WN69LP** reports neither. `device.serial_number` is always `None`, and `async_probe()` can only reject a responder whose readings fall outside the physical ranges the specification documents (for example over 100% humidity). That rules out most unrelated devices, but it cannot distinguish a WN69LP from another device whose registers happen to decode plausibly at the same addresses.
|
|
74
|
+
|
|
75
|
+
## Scope
|
|
76
|
+
|
|
77
|
+
The library reads live weather readings, RS-485 communication settings, and — on the WS90 — the 30-minute rolling history the sensor archives internally.
|
|
78
|
+
|
|
79
|
+
It does not implement:
|
|
80
|
+
|
|
81
|
+
- the WS90's "on-demand measurement" command registers (`0x9C92`-`0x9C9A`), which duplicate the live readings with tighter timing at the cost of a write-then-wait-then-read sequence,
|
|
82
|
+
- the WN69LP's automatic reporting mode (register `0x162`), which has the device push readings unprompted rather than answer polls,
|
|
83
|
+
- either device's write-only command registers (rainfall reset, software reset),
|
|
84
|
+
- the recovery command that reads or sets the baud rate and address when they are unknown, which is a non-Modbus framed exchange.
|
|
85
|
+
|
|
86
|
+
The library does **not** create or own the Modbus transport. Applications provide a [`modbus_connection.ModbusUnit`](https://github.com/home-assistant-libs/modbus-connection) and may use any backend `modbus-connection` supports (pymodbus, tmodbus, ...).
|
|
87
|
+
|
|
88
|
+
## Testing and validation
|
|
89
|
+
|
|
90
|
+
Decode logic (scale, offset, and invalid-value handling) is cross-checked against the manufacturers' own worked examples in the WS90 Modbus RTU V1.0.6 and WN69LP Modbus RTU V1.0.2 specifications. The WS90 model is additionally verified against a live sensor.
|
|
91
|
+
|
|
92
|
+
Software tests run against an in-memory mock Modbus backend (via `modbus-connection`'s pytest plugin) — no real device or server is needed to run the test suite. The register images those tests use are exported as `ecowitt_modbus.testing` so consuming applications can reuse them.
|
|
93
|
+
|
|
94
|
+
## Documentation, development and contribution guidelines
|
|
95
|
+
|
|
96
|
+
Run `script/run_checks.sh` before opening a pull request — it mirrors the CI workflow (formatting, lint, compile, tests, build) in one command. `script/format_code.sh` applies formatting and safe lint fixes only. `script/query.py` is a standalone CLI for querying a real sensor over TCP or serial; run it with `--help` for usage.
|
|
97
|
+
|
|
98
|
+
Contributions target the `develop` branch; `main` only ever receives fast-forwards from `develop` (enforced in CI).
|
|
99
|
+
|
|
100
|
+
## Related projects
|
|
101
|
+
|
|
102
|
+
This library is one of three repositories for Ecowitt Modbus support in Home Assistant:
|
|
103
|
+
|
|
104
|
+
* [`ha-ecowitt-modbus`](https://github.com/iainchesworth/ha-ecowitt-modbus) — a HACS-installable custom integration, vendoring this library.
|
|
105
|
+
* [`ha-core-ws90`](https://github.com/iainchesworth/ha-core-ws90) — a `home-assistant/core` fork adding this as a built-in integration (branch `ecowitt-ws90-integration`).
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
[build-system]
|
|
2
|
+
requires = ["hatchling"]
|
|
3
|
+
build-backend = "hatchling.build"
|
|
4
|
+
|
|
5
|
+
[project]
|
|
6
|
+
name = "ecowitt-modbus"
|
|
7
|
+
version = "0.2.0"
|
|
8
|
+
description = "Read Fine Offset / Ecowitt weather sensors over Modbus."
|
|
9
|
+
readme = "README.md"
|
|
10
|
+
requires-python = ">=3.12"
|
|
11
|
+
license = { text = "Apache-2.0" }
|
|
12
|
+
authors = [{ name = "ecowitt-modbus contributors" }]
|
|
13
|
+
keywords = ["modbus", "ecowitt", "fine-offset", "ws90", "wn69lp", "weather", "home-assistant"]
|
|
14
|
+
classifiers = [
|
|
15
|
+
"Programming Language :: Python :: 3",
|
|
16
|
+
"Topic :: Home Automation",
|
|
17
|
+
]
|
|
18
|
+
# Protocol + the device-modelling framework (modbus_connection.model). The caller
|
|
19
|
+
# injects a ModbusUnit built from whichever backend they choose.
|
|
20
|
+
dependencies = ["modbus-connection>=4.8.1,<5"]
|
|
21
|
+
|
|
22
|
+
[project.optional-dependencies]
|
|
23
|
+
# Concrete backend for the script/query.py CLI (pip install ecowitt-modbus[cli]).
|
|
24
|
+
cli = ["modbus-connection[tmodbus]>=4.8.1,<5"]
|
|
25
|
+
|
|
26
|
+
[project.urls]
|
|
27
|
+
Homepage = "https://github.com/iainchesworth/ecowitt-modbus"
|
|
28
|
+
|
|
29
|
+
[dependency-groups]
|
|
30
|
+
dev = [
|
|
31
|
+
"pytest>=8",
|
|
32
|
+
"pytest-asyncio>=0.24",
|
|
33
|
+
# Tests run against the in-memory mock backend that ships with
|
|
34
|
+
# modbus-connection (its pytest plugin is auto-registered); no real backend
|
|
35
|
+
# or server is needed.
|
|
36
|
+
]
|
|
37
|
+
|
|
38
|
+
[tool.hatch.build.targets.wheel]
|
|
39
|
+
packages = ["src/ecowitt_modbus"]
|
|
40
|
+
|
|
41
|
+
[tool.pytest.ini_options]
|
|
42
|
+
asyncio_mode = "auto"
|
|
43
|
+
testpaths = ["tests"]
|
|
44
|
+
|
|
45
|
+
[tool.ruff]
|
|
46
|
+
target-version = "py312"
|
|
47
|
+
src = ["src"]
|
|
48
|
+
|
|
49
|
+
[tool.ruff.lint]
|
|
50
|
+
select = ["E", "F", "W", "I", "UP", "B"]
|
|
51
|
+
|
|
52
|
+
[tool.ruff.lint.isort]
|
|
53
|
+
combine-as-imports = true
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
#!/usr/bin/env bash
|
|
2
|
+
set -euo pipefail
|
|
3
|
+
|
|
4
|
+
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
|
5
|
+
PYTHON_BIN="${PYTHON_BIN:-python}"
|
|
6
|
+
|
|
7
|
+
cd "$ROOT_DIR"
|
|
8
|
+
|
|
9
|
+
if ! "$PYTHON_BIN" -m ruff --version >/dev/null 2>&1; then
|
|
10
|
+
echo "==> Installing Ruff"
|
|
11
|
+
"$PYTHON_BIN" -m pip install \
|
|
12
|
+
--root-user-action=ignore \
|
|
13
|
+
"ruff>=0.15,<0.16"
|
|
14
|
+
fi
|
|
15
|
+
|
|
16
|
+
echo "==> Applying safe Ruff fixes"
|
|
17
|
+
"$PYTHON_BIN" -m ruff check --fix .
|
|
18
|
+
|
|
19
|
+
echo "==> Formatting files"
|
|
20
|
+
"$PYTHON_BIN" -m ruff format .
|
|
21
|
+
|
|
22
|
+
echo "==> Verifying Ruff checks"
|
|
23
|
+
"$PYTHON_BIN" -m ruff check .
|
|
24
|
+
|
|
25
|
+
echo "==> Formatting completed"
|