From c9d55cff23f8f0d04df55a53ccec466742085b0e Mon Sep 17 00:00:00 2001 From: Johan Bloemberg Date: Mon, 5 Jun 2017 07:36:19 +0200 Subject: [PATCH] Dsmr5 revert (#7900) * Revert "Update to dsmr_parser supporting v5 arguments." This reverts commit 3567de4b90361c262c4d3261325c2b7dbfa5441f. * Revert "Using dev branch until released upstream." This reverts commit 53e8de112cb0c47ac5031aacd74a5b18b4a418e2. * Revert "Give good example." This reverts commit 4f90fc4be677634fc7e951b4b79aa57c8213b8f8. * Revert "Allow configuring DSMR5 protocol." This reverts commit 9fa0e14187e32521e2f51cf2183a9070ee093bd0. --- homeassistant/components/sensor/dsmr.py | 7 +++---- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/homeassistant/components/sensor/dsmr.py b/homeassistant/components/sensor/dsmr.py index 8df4776459e..23324fe7360 100644 --- a/homeassistant/components/sensor/dsmr.py +++ b/homeassistant/components/sensor/dsmr.py @@ -40,8 +40,7 @@ import voluptuous as vol _LOGGER = logging.getLogger(__name__) -REQUIREMENTS = ['dsmr_parser==0.9'] - +REQUIREMENTS = ['dsmr_parser==0.8'] CONF_DSMR_VERSION = 'dsmr_version' 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_HOST, default=None): cv.string, 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, }) @@ -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] # Protocol version specific obis - if dsmr_version in ('4', '5'): + if dsmr_version == '4': gas_obis = obis_ref.HOURLY_GAS_METER_READING else: gas_obis = obis_ref.GAS_METER_READING diff --git a/requirements_all.txt b/requirements_all.txt index ac38f479c87..7fcf54b9809 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -162,7 +162,7 @@ dnspython3==1.15.0 dovado==0.4.1 # homeassistant.components.sensor.dsmr -dsmr_parser==0.9 +dsmr_parser==0.8 # homeassistant.components.dweet # homeassistant.components.sensor.dweet diff --git a/requirements_test_all.txt b/requirements_test_all.txt index f56ab8c3194..ded0c661226 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -37,7 +37,7 @@ aiohttp_cors==0.5.3 apns2==0.1.1 # homeassistant.components.sensor.dsmr -dsmr_parser==0.9 +dsmr_parser==0.8 # homeassistant.components.climate.honeywell evohomeclient==0.2.5