Skip to content

Allow configuring DSMR5 protocol. #7535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pvizeli merged 4 commits into from
May 29, 2017
Merged

Allow configuring DSMR5 protocol. #7535

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9fa0e14
Allow configuring DSMR5 protocol.
aequitas May 10, 2017
4f90fc4
Give good example.
aequitas May 10, 2017
53e8de1
Using dev branch until released upstream.
aequitas May 12, 2017
3567de4
Update to dsmr_parser supporting v5 arguments.
aequitas May 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions homeassistant/components/sensor/dsmr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.string,
vol.Optional(CONF_HOST, default=None): cv.string,
vol.Optional(CONF_DSMR_VERSION, default=DEFAULT_DSMR_VERSION): vol.All(
cv.string, vol.In(['4', '2.2'])),
cv.string, vol.In(['5', '4', '2.2'])),
vol.Optional(CONF_RECONNECT_INTERVAL, default=30): int,
})

Expand Down Expand Up @@ -93,7 +93,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
devices = [DSMREntity(name, obis) for name, obis in obis_mapping]

# Protocol version specific obis
if dsmr_version == '4':
if dsmr_version in ['4', '5']:

@pvizeli pvizeli May 10, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use a set instead a list, that is faster

@aequitas aequitas May 10, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For lists this size there is no significant difference as far as I can measure.

import timeit
>>> timeit.timeit(stmt='"4" in a', setup='a = ("4","5")', number=100000)
0.0047658109997428255
>>> timeit.timeit(stmt='"4" in a', setup='a = ["4","5"]', number=100000)
0.004662344001189922
>>> timeit.timeit(stmt='"2.2" in a', setup='a = ("4","5")', number=100000)
0.0070196070009842515
>>> timeit.timeit(stmt='"2.2" in a', setup='a = ["4","5"]', number=100000)
0.00696941199930734

gas_obis = obis_ref.HOURLY_GAS_METER_READING
else:
gas_obis = obis_ref.GAS_METER_READING
Expand Down