Skip to content

Dsmr5 revert #7900

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
balloob merged 4 commits into from
Jun 5, 2017
Merged

Dsmr5 revert #7900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c9d6a1b
Revert "Update to dsmr_parser supporting v5 arguments."
aequitas Jun 4, 2017
f6b3768
Revert "Using dev branch until released upstream."
aequitas Jun 4, 2017
576fcd6
Revert "Give good example."
aequitas Jun 4, 2017
a6d3481
Revert "Allow configuring DSMR5 protocol."
aequitas Jun 4, 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
7 changes: 3 additions & 4 deletions homeassistant/components/sensor/dsmr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@

_LOGGER = logging.getLogger(__name__)

REQUIREMENTS = ['dsmr_parser==0.9']

REQUIREMENTS = ['dsmr_parser==0.8']

CONF_DSMR_VERSION = 'dsmr_version'
CONF_RECONNECT_INTERVAL = 'reconnect_interval'
Expand All @@ -61,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(['5', '4', '2.2'])),
cv.string, vol.In(['4', '2.2'])),
vol.Optional(CONF_RECONNECT_INTERVAL, default=30): int,
})

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements_test_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down