Commit Graph

127 Commits

Author SHA1 Message Date
dc2f493739
Merge pull request #70 from bremme/master
Add SocketReader to connect to remote serial port
2021-11-21 18:10:17 +01:00
Hans Erik van Elburg
28e3c51f0d fix pylama errors on PR92 + editorial fix 2021-11-21 16:08:47 +01:00
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
Gunnar Klauberg
45cc88942a latin-1 changes folded into data_received 2021-11-21 11:25:05 +00:00
Gunnar Klauberg
26ac27c347 re-adding ascii decoding at telegram level 2021-11-14 22:29:37 +00:00
Gunnar Klauberg
7a89d6e97b re-adding ascii decoding at telegram level 2021-11-14 22:20:00 +00:00
Gunnar Klauberg
df59f3a498 decode latin1 and added ELECTRICITY_EXPORTED_TOTAL 2021-11-14 21:49:43 +00:00
Gunnar Klauberg
4073917d3e decode latin1 and added ELECTRICITY_EXPORTED_TOTAL 2021-11-14 21:29:24 +00:00
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
Gunnar Klauberg
c1202f33e9 clean-up re-format 2021-11-12 20:12:47 +00:00
Gunnar Klauberg
3092ba8b1f clean-up re-format 2021-11-12 19:24:44 +00:00
Gunnar Klauberg
8e2bdd3279 clean-up re-format 2021-11-12 19:23:38 +00:00
Gunnar Klauberg
2b724b87c3 clean-up re-format 2021-11-12 19:21:32 +00:00
Gunnar Klauberg
17b56ae07b clean-up re-format 2021-11-12 17:51:24 +00:00
Gunnar Klauberg
e4f384c2b7 clean-up re-format 2021-11-12 17:48:21 +00:00
Gunnar Klauberg
8b8b952ce1 clean-up re-format 2021-11-12 17:38:16 +00:00
Gunnar Klauberg
007b3ea089 ignoring trailing \xff in byte stream 2021-11-12 18:13:48 +01:00
Gunnar Klauberg
761aaccb3f adding EasyMeter Q3D support 2021-11-12 15:19:43 +00:00
Dennis Siemensma
947fd64377 E501 line too long (170 > 120 characters) [pycodestyle] 2021-09-22 21:33:22 +02:00
Dennis Siemensma
62aa0ac3ab W0611 'asyncio' imported but unused [pyflakes] 2021-09-22 21:31:11 +02:00
Lennart99
fb9e488102
Merge branch 'ndokter:master' into master 2021-09-07 20:40:35 +02:00
Erik
fa70ada0bf Add support for Swedish smart meters 2021-08-14 17:08:27 +02:00
Lennart99
e30c951c7f add special option for Landis+Gyr E360 (DMSR 5 with serial version 4) 2021-06-10 12:23:20 +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
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
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
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
bremme
e12aff5c0d Add SocketReader for reading ipv4 tcp sockets 2020-12-27 18:57:21 +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
af9a99d995
Revert "fix for empty parentheses in ProfileGenericParser" 2020-12-15 14:59:35 +01:00
2391f38c4a
Merge pull request #57 from avandermeer/master
fix for empty parentheses in ProfileGenericParser
2020-12-14 16:55:38 +01:00
Guy Foetz
b7c8626d0c adding the # Alternate codes for foreign countries. 2020-12-13 12:15:51 +00:00
Rob Bierbooms
2a95d33c02 Add Luxembourg equipment identifier 2020-11-04 20:42:38 +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
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
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
51f821a7fc
Merge pull request #49 from dupondje/fix_pycrc
Improve CRC speed
2020-08-23 09:30:22 +02:00
Johan Bloemberg
5630520771 Pass exception to log.exception as it is not called from within an except: clause. Add Python 3.8 test support, drop Python 3.4 test support. 2020-07-21 10:31:40 +02:00
Hans Erik van Elburg
837ba3b6f7 add json serialization 2020-05-25 01:38:14 +02:00
Hans Erik van Elburg
94447c3571 GenericProfileObject value: make embedded buffer items also appear as dicts 2020-05-17 16:58:28 +02:00
Hans Erik van Elburg
c2dea29c83 add a value property to GenericProfileObject, return a dict 2020-05-17 16:49:29 +02:00