Commit Graph

238 Commits

Author SHA1 Message Date
Dennis Siemensma
4688cf9058 test/test_protocol.py:6:1: W0611 'dsmr_parser.telegram_specifications' imported but unused [pyflakes]
test/test_protocol.py:7:1: W0611 'dsmr_parser.parsers.TelegramParser' imported but unused [pyflakes]
2021-09-22 21:26:54 +02:00
d7e1f41162 Prepare version 0.30 2021-08-18 16:59:19 +02:00
45de349062 Prepare version 0.29 2021-08-18 16:54:44 +02:00
f46f88bdb8
Merge pull request #86 from emontnemery/dsmr_sweden
Add support for Swedish smart meters
2021-08-16 17:47:47 +02:00
Erik
fa70ada0bf Add support for Swedish smart meters 2021-08-14 17:08:27 +02:00
d989cfd0e6
Merge pull request #78 from fabaff/patch-1
Add license tag
2021-04-22 10:24:02 +02:00
Fabian Affolter
ada02bf993
Add license tag 2021-04-21 23:36:25 +02:00
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
247860be16
Merge pull request #76 from frenck/frenck-2021-0772
Remove deprecated asyncio coroutine decorator
2021-03-04 21:48:04 +01:00
c590109a1d
Update README.rst
Fixed small typo
2021-03-04 21:47:12 +01:00
Franck Nijhof
adaa2dcad5
Remove deprecated asyncio coroutine decorator 2021-03-03 11:48:49 +01:00
Hans Erik van Elburg
8c861ee308 resolved comment 2021-02-14 22:08:35 +01:00
f806cc01d3 Preparing release 0.28 2021-02-12 17:56:33 +01:00
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
Rene Hogendoorn
b901b3f74e Add unit test for keep-alive 2021-02-11 11:08:19 +01:00
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
Hans Erik van Elburg
1cdda2eaba catch parse errors in TelegramParser, ignore lines that can not be parsed 2021-02-07 13:40:20 +01:00
Rene Hogendoorn
7453534927 Raised log level to warning for failed keep-alive check 2021-01-19 10:55:20 +01:00
Rene Hogendoorn
bbd73897a0 Optional keep alive monitoring for TCP/IP connections
* Since dsmr-parser is listen-only, it will not notice interrupted connections
  and DSMR device restarts. The connection will be reset after an (optional)
  keep-alive interval if no messages were received from the device.
2021-01-19 08:26:28 +01:00
Hans Erik van Elburg
804747c370 add value and unit properties to ProfileGenericObject to make sure that code like iterators that rely on that do not break 2021-01-03 19:58:19 +01:00
3dc77a8231 Prepare for release 0.27 2020-12-24 21:46:41 +01:00
d61f2229c8
Merge pull request #69 from lowdef/issue57_revisited
Issue57 revisited
2020-12-24 21:42:08 +01:00
Hans Erik van Elburg
3ddf0366e6 small fix 2020-12-24 12:44:49 +01:00
Hans Erik van Elburg
629767590b finished tox tests for issue 57 fix 2020-12-24 12:37:45 +01:00
Hans Erik van Elburg
81cccbd228 fix tox tests 2020-12-24 01:52:17 +01:00
Hans Erik van Elburg
5b1e830018 make sure that for the special case (actually invalid syntax) where a ProfileGeneric line only contains (); an empty ProfileGenericObject is created 2020-12-24 00:22:29 +01:00
albert
2d712b506d referring to parent method from _parse_values in ProfileGenericParser 2020-12-23 18:47:34 +01:00
albert
1318204d0c tempfix for empty profileGenericParser 2020-12-23 18:03:49 +01:00
feb0f88ddc Preparing release 0.26 2020-12-15 15:03:22 +01:00
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
af9a99d995
Revert "fix for empty parentheses in ProfileGenericParser" 2020-12-15 14:59:35 +01:00
a7b4929eab preparation for v0.25 2020-12-14 17:21:16 +01:00
8999b1c924 Merge branch 'master' of github.com:ndokter/dsmr_parser 2020-12-14 17:16:55 +01:00
2391f38c4a
Merge pull request #57 from avandermeer/master
fix for empty parentheses in ProfileGenericParser
2020-12-14 16:55:38 +01:00
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
Guy Foetz
b7c8626d0c adding the # Alternate codes for foreign countries. 2020-12-13 12:15:51 +00:00
684023d0b6 Preparing for release 0.24 2020-11-27 21:18:59 +01:00
1a886aa03b
Merge pull request #62 from RobBie1221/add_lux_eq
Add Luxembourg equipment identifier
2020-11-12 17:10:54 +01:00
1c7535448e Updated changelog and version 2020-11-07 08:56:24 +01:00
Rob Bierbooms
2a95d33c02 Add Luxembourg equipment identifier 2020-11-04 20:42:38 +01:00
de6725dff8
Merge pull request #58 from dunajski/master
Corrects example telegrams.
2020-11-03 21:29:35 +01:00
1b1a3f505e
Merge pull request #59 from scop/dont-install-tests
Do not install tests
2020-11-03 21:27:21 +01:00
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
Hans Erik van Elburg
700cf6a2b3 issue#60 resolved issue with x-x:24.3.0 where it contains non-integer characters, parse 2nd value as string instead of integer 2020-11-02 00:29:03 +01:00
Ville Skyttä
7a687a99a6 Do not install tests 2020-10-18 10:49:09 +03:00
dunajski
86d665df39 Change README.md according to change in ec1d37e
In ec1d37ea08 changed example telegrams,
so example telegram from README.md should be corrected too.
2020-09-28 11:35:47 +02:00
dunajski
ec1d37ea08 Corrects example telegrams.
In example telegrams there a few mistakes in header strings. Using '\'
in strings have special feature to add to string some non-printable
characters, for example to add new line we can add \n for tab \t etc. So
whenever we want to just print backslash as normal character we have to
add another '\' before. In short string "On\\Off" prints "On\Off" ascii
string.

In enquired telegrams there are few strings with \2 sign in header,
'/ISk5\2MT382-1000\r\n' and when we calculate CRC for whole given
telegram part of "..\2.." is interpreted as one character (value 0x02)
instead of two characters ('\', '2').

I think in a header in the example enlosed in P1 DSMR Companion Standard
/ISk5\2.. stand for printable '\' and '2' character instead of
"converted" to special '\2' character.
2020-09-28 10:22:16 +02:00
albert
dc902a83e9 referring to parent method from _parse_values in ProfileGenericParser 2020-09-08 12:30:51 +02:00
albert
be4386bc59 tempfix for empty profileGenericParser 2020-09-07 18:15:49 +02:00
0427ace079 Updated changelog 2020-08-23 09:36:31 +02:00