From 9fa0e14187e32521e2f51cf2183a9070ee093bd0 Mon Sep 17 00:00:00 2001 From: Johan Bloemberg Date: Wed, 10 May 2017 22:12:43 +0200 Subject: [PATCH 1/4] Allow configuring DSMR5 protocol. --- homeassistant/components/sensor/dsmr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/sensor/dsmr.py b/homeassistant/components/sensor/dsmr.py index 23324fe73603b6..127d16bc5e8db2 100644 --- a/homeassistant/components/sensor/dsmr.py +++ b/homeassistant/components/sensor/dsmr.py @@ -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, }) @@ -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']: gas_obis = obis_ref.HOURLY_GAS_METER_READING else: gas_obis = obis_ref.GAS_METER_READING From 4f90fc4be677634fc7e951b4b79aa57c8213b8f8 Mon Sep 17 00:00:00 2001 From: Johan Bloemberg Date: Wed, 10 May 2017 22:49:22 +0200 Subject: [PATCH 2/4] Give good example. --- homeassistant/components/sensor/dsmr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/sensor/dsmr.py b/homeassistant/components/sensor/dsmr.py index 127d16bc5e8db2..8347eac331d119 100644 --- a/homeassistant/components/sensor/dsmr.py +++ b/homeassistant/components/sensor/dsmr.py @@ -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 in ['4', '5']: + if dsmr_version in ('4', '5'): gas_obis = obis_ref.HOURLY_GAS_METER_READING else: gas_obis = obis_ref.GAS_METER_READING From 53e8de112cb0c47ac5031aacd74a5b18b4a418e2 Mon Sep 17 00:00:00 2001 From: Johan Bloemberg Date: Fri, 12 May 2017 20:34:58 +0200 Subject: [PATCH 3/4] Using dev branch until released upstream. --- homeassistant/components/sensor/dsmr.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/sensor/dsmr.py b/homeassistant/components/sensor/dsmr.py index 8347eac331d119..0d1dfa99485000 100644 --- a/homeassistant/components/sensor/dsmr.py +++ b/homeassistant/components/sensor/dsmr.py @@ -40,7 +40,12 @@ _LOGGER = logging.getLogger(__name__) -REQUIREMENTS = ['dsmr_parser==0.8'] +# REQUIREMENTS = ['dsmr_parser==0.9'] +# using dev branch until released upstream +# https://github.com/ndokter/dsmr_parser/pull/23 +REQUIREMENTS = ['https://github.com/aequitas/dsmr_parser/archive/dsmr5.zip' + '#dsmr_parser==0.9'] + CONF_DSMR_VERSION = 'dsmr_version' CONF_RECONNECT_INTERVAL = 'reconnect_interval' From 3567de4b90361c262c4d3261325c2b7dbfa5441f Mon Sep 17 00:00:00 2001 From: Johan Bloemberg Date: Fri, 12 May 2017 22:43:41 +0200 Subject: [PATCH 4/4] Update to dsmr_parser supporting v5 arguments. --- homeassistant/components/sensor/dsmr.py | 6 +----- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/homeassistant/components/sensor/dsmr.py b/homeassistant/components/sensor/dsmr.py index 0d1dfa99485000..8df4776459e7ef 100644 --- a/homeassistant/components/sensor/dsmr.py +++ b/homeassistant/components/sensor/dsmr.py @@ -40,11 +40,7 @@ _LOGGER = logging.getLogger(__name__) -# REQUIREMENTS = ['dsmr_parser==0.9'] -# using dev branch until released upstream -# https://github.com/ndokter/dsmr_parser/pull/23 -REQUIREMENTS = ['https://github.com/aequitas/dsmr_parser/archive/dsmr5.zip' - '#dsmr_parser==0.9'] +REQUIREMENTS = ['dsmr_parser==0.9'] CONF_DSMR_VERSION = 'dsmr_version' diff --git a/requirements_all.txt b/requirements_all.txt index 4d352c9c22b826..fe3b0e204afa13 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -156,7 +156,7 @@ dnspython3==1.15.0 dovado==0.4.1 # homeassistant.components.sensor.dsmr -dsmr_parser==0.8 +dsmr_parser==0.9 # homeassistant.components.dweet # homeassistant.components.sensor.dweet diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 0253f41f7348ab..3b1d4261a7b66c 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -41,7 +41,7 @@ apns2==0.1.1 datadog==0.15.0 # homeassistant.components.sensor.dsmr -dsmr_parser==0.8 +dsmr_parser==0.9 # homeassistant.components.climate.honeywell evohomeclient==0.2.5