Skip to content

Rewrite of Trafikverket weather - Multiple sensor types supported #15935

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
MartinHjelmare merged 11 commits into from
Aug 27, 2018
Merged

Rewrite of Trafikverket weather - Multiple sensor types supported #15935

Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fff5425
Added precipitation type from API
endor-force Aug 12, 2018
b7ad9fc
Corrected tox verification errors
endor-force Aug 12, 2018
a936880
Missed in tox - fixed
endor-force Aug 12, 2018
e606b2a
Hound witespace fix
endor-force Aug 12, 2018
d4c95bb
Updated comment to trigger travis rebuild
endor-force Aug 12, 2018
5488703
Try to retrigger travis/tox successful rebuild
endor-force Aug 13, 2018
f6db0dd
Cleaning
endor-force Aug 13, 2018
269b571
Cleaning more
endor-force Aug 13, 2018
b9f4cfc
Trafikverket rebuilt for library
endor-force Aug 26, 2018
9d38a34
Merge branch 'dev' into update_trafikverketsensor
endor-force Aug 26, 2018
e189e02
Cleaned up based on Martins input
endor-force Aug 26, 2018
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
19 changes: 13 additions & 6 deletions homeassistant/components/sensor/trafikverket_weatherstation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
vol.Required(CONF_NAME): cv.string,
vol.Required(CONF_API_KEY): cv.string,
vol.Required(CONF_STATION): cv.string,
vol.Required(CONF_TYPE): vol.In(['air', 'road']),
vol.Required(CONF_TYPE): vol.In(['air', 'road', 'precipitation']),
})


Expand Down Expand Up @@ -73,8 +73,9 @@ def state(self):

@property
def unit_of_measurement(self):
"""Return the unit of measurement."""
return TEMP_CELSIUS
"""Return the unit of measurement for temperature sensors."""
if (self._type == 'road') or (self._type == 'air'):
return TEMP_CELSIUS

@property
def device_state_attributes(self):
Expand All @@ -88,8 +89,13 @@ def update(self):

if self._type == 'road':
air_vs_road = 'Road'
keytype = 'Temp'
elif self._type == 'precipitation':
air_vs_road = 'Precipitation'
keytype = 'Type'
else:
air_vs_road = 'Air'
keytype = 'Temp'

xml = """
<REQUEST>
Expand All @@ -98,7 +104,7 @@ def update(self):
<FILTER>
<EQ name="Name" value='""" + self._station + """' />
</FILTER>
<INCLUDE>Measurement.""" + air_vs_road + """.Temp</INCLUDE>
<INCLUDE>Measurement.""" + air_vs_road + """.""" + keytype + """</INCLUDE>

@balloob balloob Aug 14, 2018

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.

We cannot accept any PR for this platform until all protocol specific code has been extracted into a third party lib which is then used.

</QUERY>
</REQUEST>"""

Expand All @@ -118,5 +124,6 @@ def update(self):
_LOGGER.error("Incorrect weather station or API key")
return

# air_vs_road contains "Air" or "Road" depending on user input.
self._state = final[air_vs_road]["Temp"]
# air_vs_road contains "Air", "Road" or "Precipitation"
# depending on user input as well as suffix key.
self._state = final[air_vs_road][keytype]