Skip to content

Moved econet from climate to water heater #17322

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
fabaff merged 3 commits into from
Oct 13, 2018
Merged

Moved econet from climate to water heater #17322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f536046
Moved econet from climate to water heater
Oct 11, 2018
086cc95
Updated .coveragerc
Oct 11, 2018
a5db887
Fixed requirements_all.txt
Oct 11, 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
2 changes: 1 addition & 1 deletion .coveragerc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,6 @@ omit =
homeassistant/components/camera/xeoma.py
homeassistant/components/camera/xiaomi.py
homeassistant/components/camera/yi.py
homeassistant/components/climate/econet.py
homeassistant/components/climate/ephember.py
homeassistant/components/climate/eq3btsmart.py
homeassistant/components/climate/flexit.py
Expand Down Expand Up @@ -840,6 +839,7 @@ omit =
homeassistant/components/tts/picotts.py
homeassistant/components/vacuum/mqtt.py
homeassistant/components/vacuum/roomba.py
homeassistant/components/water_heater/econet.py
homeassistant/components/watson_iot.py
homeassistant/components/weather/bom.py
homeassistant/components/weather/buienradar.py
Expand Down
20 changes: 0 additions & 20 deletions homeassistant/components/climate/services.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,26 +123,6 @@ nuheat_resume_program:
description: Name(s) of entities to change.
example: 'climate.kitchen'

econet_add_vacation:
description: Add a vacation to your water heater.
fields:
entity_id:
description: Name(s) of entities to change.
example: 'climate.water_heater'
start_date:
description: The timestamp of when the vacation should start. (Optional, defaults to now)
example: 1513186320
end_date:
description: The timestamp of when the vacation should end.
example: 1513445520

econet_delete_vacation:
description: Delete your existing vacation from your water heater.
fields:
entity_id:
description: Name(s) of entities to change.
example: 'climate.water_heater'

sensibo_assume_state:
description: Set Sensibo device to external state.
fields:
Expand Down
8 changes: 4 additions & 4 deletions homeassistant/components/climate/econet.py → ...sistant/components/water_heater/econet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
Support for Rheem EcoNet water heaters.

For more details about this platform, please refer to the documentation at
https://home-assistant.io/components/climate.econet/
https://home-assistant.io/components/water_heater.econet/
"""
import datetime
import logging

import voluptuous as vol

from homeassistant.components.climate import (
from homeassistant.components.water_heater import (
DOMAIN, PLATFORM_SCHEMA, STATE_ECO, STATE_ELECTRIC, STATE_GAS,
STATE_HEAT_PUMP, STATE_HIGH_DEMAND, STATE_OFF, STATE_PERFORMANCE,
SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE, ClimateDevice)
SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE, WaterHeaterDevice)
from homeassistant.const import (
ATTR_ENTITY_ID, ATTR_TEMPERATURE, CONF_PASSWORD, CONF_USERNAME,
TEMP_FAHRENHEIT)
Expand Down Expand Up @@ -109,7 +109,7 @@ def service_handle(service):
schema=DELETE_VACATION_SCHEMA)


class EcoNetWaterHeater(ClimateDevice):
class EcoNetWaterHeater(WaterHeaterDevice):
"""Representation of an EcoNet water heater."""

def __init__(self, water_heater):
Expand Down
22 changes: 22 additions & 0 deletions homeassistant/components/water_heater/services.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ set_away_mode:
away_mode:
description: New value of away mode.
example: true

set_temperature:
description: Set target temperature of water_heater device.
fields:
Expand All @@ -18,6 +19,7 @@ set_temperature:
temperature:
description: New target temperature for water heater.
example: 25

set_operation_mode:
description: Set operation mode for water_heater device.
fields:
Expand All @@ -27,3 +29,23 @@ set_operation_mode:
operation_mode:
description: New value of operation mode.
example: eco

econet_add_vacation:
description: Add a vacation to your water heater.
fields:
entity_id:
description: Name(s) of entities to change.
example: 'water_heater.econet'
start_date:
description: The timestamp of when the vacation should start. (Optional, defaults to now)
example: 1513186320
end_date:
description: The timestamp of when the vacation should end.
example: 1513445520

econet_delete_vacation:
description: Delete your existing vacation from your water heater.
fields:
entity_id:
description: Name(s) of entities to change.
example: 'water_heater.econet'
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 @@ -859,7 +859,7 @@ pydukeenergy==0.0.6
# homeassistant.components.sensor.ebox
pyebox==1.1.4

# homeassistant.components.climate.econet
# homeassistant.components.water_heater.econet
pyeconet==0.0.6

# homeassistant.components.switch.edimax
Expand Down