retoor/dsmr_parser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
395 Commits 11 Branches 46 Tags
bd2e64b0cdc0e522862241a01f19361ea5847c1b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nigel bd2e64b0cd moved decryption logic and simplified it a bit 2024-12-22 14:28:22 +01:00
Nigel eb0d3d7353 Move client tests to own folder 2024-12-22 13:37:21 +01:00
Nigel 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
Nigel 94189b6b63 Preparing release 1.4.2 2024-07-14 14:21:13 +02:00
Nigel 059c0802ad Fix changelog 2024-06-04 16:06:38 +02:00
Nigel d7f30b5069 Release 1.4.1 2024-06-04 15:59:32 +02:00
Nigel d680d44683 Update CHANGELOG.rst 2024-03-12 13:26:04 +01:00
Nigel 6387cc4440 CHANGELOG formatting 2024-03-12 12:56:13 +01:00
Nigel 61985c5c89 Changelog formatting 2024-03-12 12:54:28 +01:00
Nigel 88aaa2d30f Release 1.4.0 2024-03-12 12:50:36 +01:00
Nigel be61d4aaf9 Prepare release 1.3.2 2024-01-29 14:29:02 +01:00
Nigel 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
Nigel 88923622a9 Release 1.3.0 2023-08-01 09:26:40 +02:00
Nigel af2e6558de Revert "Added E.ON HUNGARY specification (#134)" (#135) 
This reverts commit 0752deb58a.
 2023-07-26 15:03:29 +02:00
Nigel 3fd032f18f Release 1.2.4 2023-07-11 22:01:00 +02:00
Nigel 99c7b0d9f0 Prepare release 1.2.3 2023-04-18 20:48:30 +02:00
Nigel ae8a2baaab Merge branch 'master' of github.com:ndokter/dsmr_parser 2023-04-12 10:58:40 +02:00
Nigel d3fab4f105 Release 1.2.2 2023-04-12 10:57:38 +02:00
Nigel 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
Nigel 9847bdf66b Prepare releasse 1.2.1 2023-04-05 11:19:42 +02:00
Nigel 76da334234 Update release notes for 1.2.0 where not all additions where added 2023-04-05 11:14:43 +02:00
Nigel 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
Nigel 6fb2ad3495 Merge pull request #126 from jchevalier7/feat/iskra_ie 
Add Iskra IE.x meters specification
 2023-02-12 13:45:43 +01:00
Nigel f156995138 Merge pull request #125 from dupondje/ignore_invalid_time 
Fix parsing with invalid timestamps
 2023-02-12 13:43:43 +01:00
Nigel ca8392504d Release 1.1.0 2023-02-08 12:02:14 +01:00
Nigel 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
Nigel 0a259a3c9d fix code style 2023-01-01 20:55:58 +01:00
Nigel f851f48225 Merge pull request #118 from dennissiemensma/bug/readme-shield 
Fixed Shields badge in favor of badges/shields#8671
 2023-01-01 20:37:24 +01:00
Nigel 3a3054324a Merge pull request #116 from lowdef/add_pylama_backin_post_py36 
add pylama back in + fix uniform style issues reported by pylama
 2023-01-01 20:36:39 +01:00
Nigel 041ac758f4 Merge pull request #115 from robcalon/patch-1 
asynchronous read_as_object method
 2023-01-01 20:35:48 +01:00
Nigel 10613acbd9 Merge pull request #114 from dupondje/fix_name_mapping 
Fix missing value from name mapping
 2022-12-29 19:50:26 +01:00
Nigel 650d16862b Fix changelog 2022-12-22 10:18:47 +01:00
Nigel 301a00e226 Prepare release 1.0.0 2022-12-22 10:13:26 +01:00
Nigel d0cc429eda Merge pull request #113 from dupondje/add_peakusage 
Add peakusage
 2022-12-12 20:32:42 +01:00
Nigel 98a10998e9 Remove pylama because of incompatibility with python3.6, maybe find replacement 2022-10-19 14:20:29 +02:00
Nigel 00ac7c71be Prepare version 0.34 2022-10-19 13:52:08 +02:00
Nigel 594db890fe Merge pull request #110 from debug-richard/master 
Adds support for the Sagemcom T210-D-r smart meter
 2022-10-16 12:49:55 +02:00
Nigel 2aba206c6f Merge branch 'master' of github.com:ndokter/dsmr_parser 2022-04-20 22:10:27 +02:00
Nigel 247a7446f5 Prepare release 0.33 2022-04-20 22:10:06 +02:00
Nigel 5c378f3419 Update README.rst 2022-04-20 22:02:35 +02:00
Nigel b825faa719 Update README.rst 2022-04-20 22:00:58 +02:00
Nigel 7f35cd3c73 Merge pull request #63 from mjkl-gh/master 
Improve documentation asyncio
 2022-04-20 21:58:59 +02:00
Nigel 63338fbf06 Merge branch 'master' into master 2022-04-20 21:58:51 +02:00
Nigel dd9e264f5c Merge pull request #107 from dennissiemensma/feature/python-3.10 
Test Python 3.10 in CI + legacy badge fix
 2022-04-20 21:48:09 +02:00
Nigel 5c4d6ed98b Merge pull request #106 from gigatexel/master 
Update telegram_specifications.py
 2022-04-20 21:47:27 +02:00
Nigel c0a509dab3 Merge pull request #105 from gigatexel/master 
Improve compatiblity with Belgian standard
 2022-04-08 10:06:02 +02:00
Nigel ddbcb67088 Merge pull request #104 from ndokter/issue-101 
Issue 101
 2022-02-23 13:39:30 +01:00
Nigel 746fbc4fff Merge pull request #103 from vladimirvrabely/issue-101 
Add FileReader test
 2022-02-22 20:35:03 +01:00
Nigel 304593c246 Merge pull request #102 from ndokter/issue-101 
fix FileReader from not completing
 2022-02-22 20:33:31 +01:00
Nigel 0340b25733 Update README.rst 2022-02-21 13:38:06 +01:00
Nigel 5c838efbe1 Fix CHANGELOG formatting 2022-01-04 21:16:03 +01:00
Nigel 9f66c075d6 Prepare version 0.32 2022-01-04 21:14:53 +01:00
Nigel 2dafc7e7e4 Merge branch 'master' of github.com:ndokter/dsmr_parser 2022-01-04 21:10:44 +01:00
Nigel b74572238e Merge pull request #98 from rhpijnacker/feature/rfxtrx 
Support DSMR data read via RFXtrx with integrated P1 reader
 2022-01-04 09:59:54 +01:00
Nigel b562510e40 Merge pull request #96 from lowdef/master 
resolve name clash as reported in issue #95
 2021-11-28 12:27:22 +01:00
Nigel dc2f493739 Merge pull request #70 from bremme/master 
Add SocketReader to connect to remote serial port
 2021-11-21 18:10:17 +01:00
Nigel 0a20dea7ed Merge pull request #93 from lowdef/master 
fix pylama errors on PR92 + editorial fix
 2021-11-21 17:56:01 +01:00
Nigel 60af45be25 Prepare version 0.31 2021-11-21 14:06:11 +01:00
Nigel 00248f490e Merge pull request #92 from Aeroid/master 
Support for (German) EasyMeter Q3D using COM-1 Ethernet Gateway
 2021-11-21 13:59:35 +01:00
Nigel 3a4fcd7da1 Merge pull request #89 from dennissiemensma/feature/github-actions-with-fixes 
Replace Travis with GitHub Actions (+ minor fixes)
 2021-11-14 21:08:09 +01:00
Nigel d5b427ba4f Merge pull request #82 from Lennart99/master 
add special option for Landis+Gyr E360 (DMSR 5 with serial version 4)
 2021-11-14 21:06:58 +01:00
Nigel dc608f9da3 Update README.rst 2021-10-31 13:08:42 +01:00
Nigel d7e1f41162 Prepare version 0.30 2021-08-18 16:59:19 +02:00
Nigel 45de349062 Prepare version 0.29 2021-08-18 16:54:44 +02:00
Nigel f46f88bdb8 Merge pull request #86 from emontnemery/dsmr_sweden 
Add support for Swedish smart meters
 2021-08-16 17:47:47 +02:00
Nigel d989cfd0e6 Merge pull request #78 from fabaff/patch-1 
Add license tag
 2021-04-22 10:24:02 +02:00
Nigel e607b62fa2 Merge pull request #71 from lowdef/fix_ProfileGenericObject_for_telegram_iterator 
add value and unit properties to ProfileGenericObject to make sure they do not break
 2021-03-04 21:49:03 +01:00
Nigel 247860be16 Merge pull request #76 from frenck/frenck-2021-0772 
Remove deprecated asyncio coroutine decorator
 2021-03-04 21:48:04 +01:00
Nigel c590109a1d Update README.rst 
Fixed small typo
 2021-03-04 21:47:12 +01:00
Nigel f806cc01d3 Preparing release 0.28 2021-02-12 17:56:33 +01:00
Nigel 399532f244 Merge pull request #73 from hogend/keep-alive 
Optional keep alive monitoring for TCP/IP connections
 2021-02-12 17:38:48 +01:00
Nigel a255380953 Merge pull request #74 from lowdef/issue72_robustness_fix 
catch parse errors in TelegramParser, ignore lines that can not be parsed
 2021-02-07 14:52:45 +01:00
Nigel 3dc77a8231 Prepare for release 0.27 2020-12-24 21:46:41 +01:00
Nigel d61f2229c8 Merge pull request #69 from lowdef/issue57_revisited 
Issue57 revisited
 2020-12-24 21:42:08 +01:00
Nigel feb0f88ddc Preparing release 0.26 2020-12-15 15:03:22 +01:00
Nigel 602129a665 Merge pull request #68 from ndokter/revert-57-master 
Revert "fix for empty parentheses in ProfileGenericParser"
 2020-12-15 15:00:07 +01:00
Nigel af9a99d995 Revert "fix for empty parentheses in ProfileGenericParser" 2020-12-15 14:59:35 +01:00
Nigel a7b4929eab preparation for v0.25 2020-12-14 17:21:16 +01:00
Nigel 8999b1c924 Merge branch 'master' of github.com:ndokter/dsmr_parser 2020-12-14 17:16:55 +01:00
Nigel 2391f38c4a Merge pull request #57 from avandermeer/master 
fix for empty parentheses in ProfileGenericParser
 2020-12-14 16:55:38 +01:00
Nigel d1a6e15c68 Merge pull request #66 from GuyFoetz/foreign_name_mapping 
adding the # Alternate codes for foreign countries.
 2020-12-13 13:22:15 +01:00
Nigel 684023d0b6 Preparing for release 0.24 2020-11-27 21:18:59 +01:00
Nigel 1a886aa03b Merge pull request #62 from RobBie1221/add_lux_eq 
Add Luxembourg equipment identifier
 2020-11-12 17:10:54 +01:00
Nigel 1c7535448e Updated changelog and version 2020-11-07 08:56:24 +01:00
Nigel de6725dff8 Merge pull request #58 from dunajski/master 
Corrects example telegrams.
 2020-11-03 21:29:35 +01:00
Nigel 1b1a3f505e Merge pull request #59 from scop/dont-install-tests 
Do not install tests
 2020-11-03 21:27:21 +01:00
Nigel ebea385753 Merge pull request #61 from lowdef/issue60 
issue#60 resolved issue with x-x:24.3.0 where it contains non-integer…
 2020-11-03 21:25:39 +01:00
Nigel 0427ace079 Updated changelog 2020-08-23 09:36:31 +02:00
Nigel addf9b590e Merge pull request #55 from aequitas/exception 
Pass exception to log.exception as it is not called from within an ex…
 2020-08-23 09:32:44 +02:00
Nigel 51f821a7fc Merge pull request #49 from dupondje/fix_pycrc 
Improve CRC speed
 2020-08-23 09:30:22 +02:00
Nigel f9e188812f Merge pull request #54 from lowdef/fix_json_serialization 
Fix json serialization
 2020-05-29 17:22:53 +02:00
Nigel bb486fc76f Merge pull request #53 from lowdef/profile_generic_parser 
Profile generic parser
 2020-05-17 09:12:56 +02:00
Nigel d423070853 Merge pull request #45 from lowdef/extend_filereader 
Extend filereader
 2020-02-03 17:31:15 +01:00
Nigel 987d35332a Merge branch 'master' into extend_filereader 2020-02-03 17:29:39 +01:00
Nigel dc6c35a0b6 Updated changelog 2020-01-28 19:40:27 +01:00
Nigel 47c20e763f Merge branch 'master' of github.com:ndokter/dsmr_parser 2020-01-28 19:36:23 +01:00
Nigel e7164d9af7 Merge pull request #48 from dupondje/fix_pycrc 
Include needed PyCRC code
 2020-01-28 19:35:42 +01:00
Nigel eac9681e07 updated changelog 2019-12-21 17:37:50 +01:00
Nigel 659560222a Merge pull request #40 from lowdef/add_a_true_telegram_object 
Add a true telegram object
 2019-12-21 17:36:28 +01:00
Nigel 74fe1f2d1e Merge branch 'master' into add_a_true_telegram_object 2019-12-21 17:34:58 +01:00