Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dsmr5 revert (#7900) 

* Revert "Update to dsmr_parser supporting v5 arguments."

This reverts commit 3567de4b90.

* Revert "Using dev branch until released upstream."

This reverts commit 53e8de112c.

* Revert "Give good example."

This reverts commit 4f90fc4be6.

* Revert "Allow configuring DSMR5 protocol."

This reverts commit 9fa0e14187.
pull/7843/merge
Johan Bloemberg 2017-06-05 07:36:19 +02:00 committed by Paulus Schoutsen
parent aeb1d3d3fe
commit c9d55cff23
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
homeassistant/components/sensor/dsmr.py
View File

@ -40,8 +40,7 @@ import voluptuous as vol
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
REQUIREMENTS = ['dsmr_parser==0.9'] REQUIREMENTS = ['dsmr_parser==0.8']
CONF_DSMR_VERSION = 'dsmr_version' CONF_DSMR_VERSION = 'dsmr_version'
CONF_RECONNECT_INTERVAL = 'reconnect_interval' CONF_RECONNECT_INTERVAL = 'reconnect_interval'
@ -61,7 +60,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.string, vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.string,
vol.Optional(CONF_HOST, default=None): cv.string, vol.Optional(CONF_HOST, default=None): cv.string,
vol.Optional(CONF_DSMR_VERSION, default=DEFAULT_DSMR_VERSION): vol.All( vol.Optional(CONF_DSMR_VERSION, default=DEFAULT_DSMR_VERSION): vol.All(
cv.string, vol.In(['5', '4', '2.2'])), cv.string, vol.In(['4', '2.2'])),
vol.Optional(CONF_RECONNECT_INTERVAL, default=30): int, vol.Optional(CONF_RECONNECT_INTERVAL, default=30): int,
}) })
@ -94,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] devices = [DSMREntity(name, obis) for name, obis in obis_mapping]
# Protocol version specific obis # Protocol version specific obis
if dsmr_version in ('4', '5'): if dsmr_version == '4':
gas_obis = obis_ref.HOURLY_GAS_METER_READING gas_obis = obis_ref.HOURLY_GAS_METER_READING
else: else:
gas_obis = obis_ref.GAS_METER_READING gas_obis = obis_ref.GAS_METER_READING

2
requirements_all.txt
View File

@ -162,7 +162,7 @@ dnspython3==1.15.0
dovado==0.4.1 dovado==0.4.1
# homeassistant.components.sensor.dsmr # homeassistant.components.sensor.dsmr
dsmr_parser==0.9 dsmr_parser==0.8
# homeassistant.components.dweet # homeassistant.components.dweet
# homeassistant.components.sensor.dweet # homeassistant.components.sensor.dweet

2
requirements_test_all.txt
View File

@ -37,7 +37,7 @@ aiohttp_cors==0.5.3
apns2==0.1.1 apns2==0.1.1
# homeassistant.components.sensor.dsmr # homeassistant.components.sensor.dsmr
dsmr_parser==0.9 dsmr_parser==0.8
# homeassistant.components.climate.honeywell # homeassistant.components.climate.honeywell
evohomeclient==0.2.5 evohomeclient==0.2.5