Commit Graph

395 Commits

Author SHA1 Message Date
8f2772e4e7 Added review.
All checks were successful
Tests / Python ${{ matrix.python-version }} (3.10) (push) Successful in 5m31s
Tests / Python ${{ matrix.python-version }} (3.12) (push) Successful in 3m4s
Tests / Python ${{ matrix.python-version }} (3.11) (push) Successful in 10m46s
Tests / Python ${{ matrix.python-version }} (3.7) (push) Successful in 3m11s
Tests / Python ${{ matrix.python-version }} (3.9) (push) Successful in 2m39s
Tests / Python ${{ matrix.python-version }} (3.8) (push) Successful in 10m58s
2024-12-29 20:48:56 +01:00
0ef1b057a6 Added review.
Some checks failed
Tests / Python ${{ matrix.python-version }} (3.12) (push) Waiting to run
Tests / Python ${{ matrix.python-version }} (3.7) (push) Waiting to run
Tests / Python ${{ matrix.python-version }} (3.8) (push) Waiting to run
Tests / Python ${{ matrix.python-version }} (3.9) (push) Waiting to run
Tests / Python ${{ matrix.python-version }} (3.10) (push) Has been cancelled
Tests / Python ${{ matrix.python-version }} (3.11) (push) Has been cancelled
2024-12-29 20:47:35 +01:00
99ad21c896
added a bit of documentation on how to run tests (#165)
* added a bit of documentation on how to run tests

* formatting

* formatting

* formatting

* formatting

* formatting

* formatting
2024-08-25 14:55:22 +02:00
94189b6b63 Preparing release 1.4.2 2024-07-14 14:21:13 +02:00
Dennis Siemensma
8829260b15
Bump Github Actions to latest versions in favor of Node deprecations (#159) 2024-06-15 11:33:15 +02:00
Ido Szargel
55ac551a2a
Add socket timeout (#155)
* Add socket timeout
2024-06-10 16:19:01 +02:00
J. Nick Koston
fc65326370
Swap pyserial-asyncio for pyserial-asyncio-fast (#158)
* Swap pyserial-asyncio for pyserial-asyncio-fast

fixes #154

* actually commit the import change
2024-06-07 16:08:35 +02:00
059c0802ad Fix changelog 2024-06-04 16:06:38 +02:00
d7f30b5069 Release 1.4.1 2024-06-04 15:59:32 +02:00
Joakim Plate
b42ceb6555
Avoid loading timezone at runtime (#157)
* Avoid loading timezone at runtime

Pytz will load timezone info from files in
a lazy fashion on first access. This triggers warnings in HA due to it blocking the event loop.

Pre-load the needed timezone info at module import instead, which will run in
executor in HA.

* Update value_types.py
2024-06-04 15:51:03 +02:00
gigatexel
3cf627eedc
Change checksum log level (#151)
* Update filereader.py

* Update socket_.py

* Update serial_.py

* Update protocol.py

* Update socket_.py
2024-03-28 12:40:17 +01:00
d680d44683
Update CHANGELOG.rst 2024-03-12 13:26:04 +01:00
6387cc4440
CHANGELOG formatting 2024-03-12 12:56:13 +01:00
61985c5c89 Changelog formatting 2024-03-12 12:54:28 +01:00
88aaa2d30f Release 1.4.0 2024-03-12 12:50:36 +01:00
dupondje
1ce0925b61
Copy head_parsers list on construct. (#150)
We need to create a copy of the head_parsers.
Otherwise the self.value_formats contains just a reference to
head_parsers.
But the self.value_formats is modified in the _parse_values, causing
invalid values in the head_parsers list.
2024-03-12 11:14:43 +01:00
dupondje
bc35a051f2
Change DSMR 5 and 5B to use DSMR devices (#142)
At least the BE and the NL DSMR devices use MBUS.
Therefore we make the MBUS obis reference generic, and convert the V5
telegram to use MBUS values.

Finally set self.maxDiff = None to have a full test output on some
tests.
2024-03-07 11:21:23 +01:00
Gunnar Klauberg
fcbcbb30e0
Q3D add CURRENT_ELECTRICITY_DELIVERY (#149)
add CURRENT_ELECTRICITY_DELIVERY sensor for Q3D
2024-02-19 14:31:09 +01:00
be61d4aaf9 Prepare release 1.3.2 2024-01-29 14:29:02 +01:00
1680cacf49
fix protocol unit test for python3.12 (#148)
* fix protocol unit test for python3.12

* add workflow test for python 3.12
2024-01-29 14:25:39 +01:00
dupondje
739419e3ee
Remove BELGIUM_MAX_POWER_PER_PHASE (#144)
This commit removes BELGIUM_MAX_POWER_PER_PHASE and uses
ACTUAL_TRESHOLD_ELECTRICITY as this has same regex. So useless to keep
the BELIUM variant.
2023-11-07 12:10:42 +01:00
Jean-Louis Dupond
d2ff6f4bb9 Fix tests after FUSE_TRESHOLD rename 2023-11-06 15:10:36 +01:00
Jean-Louis Dupond
a316d93082 Adjust the naming of the MAX_POWER and MAX_CURRENT obis values 2023-11-06 15:10:36 +01:00
Jean-Louis Dupond
01d7622c40 Release 1.3.1 2023-11-06 15:09:47 +01:00
dupondje
e8a86272ea
Merge pull request #143 from dupondje/fix_invalid_occured
Fix parsing peak usage when value is not set
2023-11-06 14:30:20 +01:00
Jean-Louis Dupond
389bcefb50 Fix parsing peak usage when value is not set
Sometimes peak usage is not yet visible in the 13 months history code.
It gives a 0.0kW value with timestamp (632525252525W).

Also the peak usage value can be invalid, handle this case also.
2023-11-06 09:50:34 +01:00
88923622a9 Release 1.3.0 2023-08-01 09:26:40 +02:00
balazs92117
2f1e080df3
Refactor of name mapping, added E.ON Hungary (#137)
* Added EON HUNGARY specification

* refactoring obis name mapping
2023-08-01 09:23:17 +02:00
af2e6558de
Revert "Added E.ON HUNGARY specification (#134)" (#135)
This reverts commit 0752deb58a.
2023-07-26 15:03:29 +02:00
balazs92117
0752deb58a
Added E.ON HUNGARY specification (#134)
* Added EON HUNGARY specification
2023-07-26 13:31:59 +02:00
3fd032f18f Release 1.2.4 2023-07-11 22:01:00 +02:00
Emilio Jose Palacios-Garcia
4602e8c99f
EQUIPMENT IDENTIFIER is wrong for Fluvius meters when other mbus devices are present (#133)
* change obis of fluvius meter ID to BELGIUM_EQUIPMENT_IDENTIFIER

* update test case to use direct access to attributes

* fix test case for pipeline
2023-07-11 21:43:41 +02:00
Emilio Jose Palacios-Garcia
f3444a515d
EQUIPMENT IDENTIFIER is wrong for Fluvius meters when other mbus devices are present (#133)
* change obis of fluvius meter ID to BELGIUM_EQUIPMENT_IDENTIFIER
2023-07-11 21:43:25 +02:00
99c7b0d9f0 Prepare release 1.2.3 2023-04-18 20:48:30 +02:00
dupondje
84973872af
Fix parsing tests and line start matching (#132)
* Raise parsing exception and check it in tests

* use multiline regex and match everything at the line start
2023-04-14 16:51:01 +02:00
ae8a2baaab Merge branch 'master' of github.com:ndokter/dsmr_parser 2023-04-12 10:58:40 +02:00
d3fab4f105 Release 1.2.2 2023-04-12 10:57:38 +02:00
5a59c36646
improve performance parsing speed by about 6% by caching compiled regexes (#131)
* improve performance parsing speed by about 6% by caching compiled regexes
2023-04-12 10:52:11 +02:00
9847bdf66b Prepare releasse 1.2.1 2023-04-05 11:19:42 +02:00
76da334234 Update release notes for 1.2.0 where not all additions where added 2023-04-05 11:14:43 +02:00
Emilio Jose Palacios-Garcia
c03d2483d7
Bug/duplicate index BELGIUM_MAXIMUM_DEMAND_13_MONTHS (#129)
* fix index offset for month timestamp in BELGIUM_MAXIMUM_DEMAND_13_MONTHS

* add timestamps to test case

---------

Co-authored-by: Emilio Jose Palacios Garcia <epalacio@emilio.esat.kuleuven.be>
2023-04-05 11:06:21 +02:00
de167c89b6
issue-51-telegram refactored TelegramParser.parse to return Telegram … (#121)
* issue-51-telegram improved mbus device parsing; refactored TelegramParser.parse to return Telegram object which is backwards compatible with the dict result
2023-02-19 12:24:44 +01:00
6fb2ad3495
Merge pull request #126 from jchevalier7/feat/iskra_ie
Add Iskra IE.x meters specification
2023-02-12 13:45:43 +01:00
f156995138
Merge pull request #125 from dupondje/ignore_invalid_time
Fix parsing with invalid timestamps
2023-02-12 13:43:43 +01:00
AA61SL
fe175a9a69 feat: Fixing test file to run setup.py test 2023-02-09 11:07:21 +01:00
AA61SL
78880a1881 feat: add Iskra IE.x meters 2023-02-09 11:01:00 +01:00
ca8392504d Release 1.1.0 2023-02-08 12:02:14 +01:00
Jean-Louis Dupond
edf535f987 Fix parsing with invalid timestamps
Sometimes the timestamp in the DSMR message is invalid (when no data
read read from the mbus meter?), and then parsing fails.
Fixing this by handling the exception and returning None for invalid
timestamps. Fixes: #120
2023-01-30 14:45:32 +01:00
026b91cd49
Merge pull request #124 from yada75/reactive
add instantaneous reactive power + fixed swapped reactive total import export
2023-01-28 13:32:32 +01:00
yada75
02eb3a34dd
Update obis_name_mapping.py 2023-01-18 20:02:54 +01:00