Moved all code into the switch component

Per request moved all the code inside the switch
This commit is contained in:
J.J.Barrancos 2017-08-30 16:11:40 +02:00
parent 67007aed40
commit d2d28fd419
4 changed files with 131 additions and 163 deletions

View file

@ -416,7 +416,6 @@ omit =
homeassistant/components/notify/xmpp.py
homeassistant/components/nuimo_controller.py
homeassistant/components/prometheus.py
homeassistant/components/rainbird.py
homeassistant/components/remote/harmony.py
homeassistant/components/remote/itach.py
homeassistant/components/scene/hunterdouglas_powerview.py
@ -551,6 +550,7 @@ omit =
homeassistant/components/switch/orvibo.py
homeassistant/components/switch/pilight.py
homeassistant/components/switch/pulseaudio_loopback.py
homeassistant/components/switch/rainbird.py
homeassistant/components/switch/rainmachine.py
homeassistant/components/switch/rest.py
homeassistant/components/switch/rpi_rf.py

View file

@ -1,155 +0,0 @@
"""
Support for Rain Bird Irrigation system LNK WiFi Module.
For more details about this component, please refer to the documentation at
https://home-assistant.io/components/rainbird/
"""
import logging
import voluptuous as vol
import homeassistant.helpers.config_validation as cv
from homeassistant.exceptions import PlatformNotReady
from homeassistant.helpers.entity_component import EntityComponent
from homeassistant.helpers.entity import Entity
from homeassistant.const import (
CONF_HOST, CONF_PASSWORD)
REQUIREMENTS = ['pyrainbird==0.0.9']
DOMAIN = 'rainbird'
_LOGGER = logging.getLogger(__name__)
CONFIG_SCHEMA = vol.Schema({
DOMAIN: vol.Schema({
vol.Required(CONF_HOST): cv.string,
vol.Required(CONF_PASSWORD): cv.string,
}),
}, extra=vol.ALLOW_EXTRA)
def setup(hass, config):
"""Set up the Rain Bird component."""
server = config[DOMAIN].get(CONF_HOST)
password = config[DOMAIN].get(CONF_PASSWORD)
component = EntityComponent(_LOGGER, DOMAIN, hass)
from pyrainbird import RainbirdController
controller = RainbirdController(_LOGGER)
controller.setConfig(server, password)
_LOGGER.info("Rain Bird Controller set to " + str(server))
rbdevice = RainbirdDevice(hass, controller)
hass.data["DATA_RAINBIRD"] = rbdevice
initialstatus = rbdevice.update()
if initialstatus == -1:
_LOGGER.error("Error getting state. Possible configuration issues")
raise PlatformNotReady
else:
_LOGGER.info("Initialized Rain Bird Controller")
entities = []
entities.append(rbdevice)
component.add_entities(entities)
return True
class RainbirdDevice(Entity):
"""Rain Bird Device."""
_state = -1
def __init__(self, hass, controller):
"""Initialize the device."""
self.hass = hass
self.controller = controller
self._name = "Rainbird_Controller"
self._stations = {}
# For automation purposes add 2 services
def start_irrigation_call(call):
"""Start irrigation from service call."""
station_id = call.data.get("station_id")
duration = call.data.get("duration")
if station_id and duration:
self.start_irrigation(station_id, duration)
else:
_LOGGER.warning("Error in start_irrigation call. \
station_id and duration need to be set")
def stop_irrigation_call(call):
"""Start irrigation from service call."""
self.stop_irrigation()
hass.services.register(DOMAIN, 'start_irrigation',
start_irrigation_call)
hass.services.register(DOMAIN, 'stop_irrigation',
stop_irrigation_call)
def should_poll(self):
"""Return True if entity has to be polled for state."""
return True
@property
def name(self):
"""Get the name of the device."""
return self._name
def available(self):
"""Return True if entity is available."""
return self._state != -1
def setstate(self, state):
"""Force set the current state value."""
self._state = state
@property
def state(self):
"""Return the state of the entity."""
return self._state
def start_irrigation(self, station_id, duration):
"""
Start Irrigation command towards Rain Bird LNK WiFi stick.
@param call: should be a home assistant call object with data
station for Zone to sprinkle and duration for the time
"""
_LOGGER.info("Requesting irrigation for " +
str(station_id) + " duration " + str(duration))
result = self.controller.startIrrigation(
int(station_id), int(duration))
if result == 1:
_LOGGER.info("Irrigation started on " + str(station_id) +
" for " + str(duration))
elif result == 0:
_LOGGER.error("Error sending request")
else:
_LOGGER.error("Request was not acknowledged!")
def stop_irrigation(self):
"""Stop the irrigation (if one is running)."""
_LOGGER.info("Stop request irrigation")
result = self.controller.stopIrrigation()
if result == 1:
_LOGGER.info("Stopped irrigation")
elif result == 0:
_LOGGER.error("Error sending request")
else:
_LOGGER.error("Request was not acknowledged!")
def update(self):
"""
Get current active station.
@return: integer which station is active
"""
_LOGGER.info("Request irrigation state")
result = self.controller.currentIrrigation()
if result < 0:
_LOGGER.error("Error sending request")
return -1
self._state = result

View file

@ -9,20 +9,24 @@ import logging
import voluptuous as vol
from homeassistant.components import rainbird
from homeassistant.helpers.entity import Entity
from homeassistant.helpers.entity_component import EntityComponent
from homeassistant.components.switch import SwitchDevice
from homeassistant.const import (CONF_PLATFORM, CONF_SWITCHES, CONF_ZONE,
CONF_FRIENDLY_NAME, CONF_TRIGGER_TIME,
CONF_SCAN_INTERVAL)
CONF_SCAN_INTERVAL, CONF_HOST, CONF_PASSWORD)
from homeassistant.helpers import config_validation as cv
from homeassistant.exceptions import PlatformNotReady
DEPENDENCIES = ['rainbird']
REQUIREMENTS = ['pyrainbird==0.0.9']
DOMAIN = 'rainbird'
_LOGGER = logging.getLogger(__name__)
PLATFORM_SCHEMA = vol.Schema({
vol.Required(CONF_PLATFORM): rainbird.DOMAIN,
vol.Required(CONF_PLATFORM): DOMAIN,
vol.Required(CONF_HOST): cv.string,
vol.Required(CONF_PASSWORD): cv.string,
vol.Required(CONF_SWITCHES, default={}): vol.Schema({
cv.string: {
vol.Optional(CONF_FRIENDLY_NAME): cv.string,
@ -36,8 +40,29 @@ PLATFORM_SCHEMA = vol.Schema({
def setup_platform(hass, config, add_devices, discovery_info=None):
"""Set up Rain Bird switches over a Rain Bird controller."""
server = config.get(CONF_HOST)
password = config.get(CONF_PASSWORD)
component = EntityComponent(_LOGGER, DOMAIN, hass)
from pyrainbird import RainbirdController
controller = RainbirdController(_LOGGER)
controller.setConfig(server, password)
_LOGGER.info("Rain Bird Controller set to " + str(server))
rbdevice = RainbirdDevice(hass, controller)
initialstatus = rbdevice.update()
if initialstatus == -1:
_LOGGER.error("Error getting state. Possible configuration issues")
raise PlatformNotReady
else:
_LOGGER.info("Initialized Rain Bird Controller")
entities = []
entities.append(rbdevice)
component.add_entities(entities)
devices = []
rbdevice = hass.data.get("DATA_RAINBIRD")
for dev_id, switch in config.get(CONF_SWITCHES).items():
devices.append(RainBirdSwitch(rbdevice, switch, dev_id))
add_devices(devices)
@ -99,3 +124,101 @@ class RainBirdSwitch(SwitchDevice):
def is_on(self):
"""Return true if switch is on."""
return self._state
class RainbirdDevice(Entity):
"""Rain Bird Device."""
_state = -1
def __init__(self, hass, controller):
"""Initialize the device."""
self.hass = hass
self.controller = controller
self._name = "Rainbird_Controller"
self._stations = {}
# For automation purposes add 2 services
def start_irrigation_call(call):
"""Start irrigation from service call."""
station_id = call.data.get("station_id")
duration = call.data.get("duration")
if station_id and duration:
self.start_irrigation(station_id, duration)
else:
_LOGGER.warning("Error in start_irrigation call. \
station_id and duration need to be set")
def stop_irrigation_call(call):
"""Start irrigation from service call."""
self.stop_irrigation()
hass.services.register(DOMAIN, 'start_irrigation',
start_irrigation_call)
hass.services.register(DOMAIN, 'stop_irrigation',
stop_irrigation_call)
def should_poll(self):
"""Return True if entity has to be polled for state."""
return True
@property
def name(self):
"""Get the name of the device."""
return self._name
def available(self):
"""Return True if entity is available."""
return self._state != -1
def setstate(self, state):
"""Force set the current state value."""
self._state = state
@property
def state(self):
"""Return the state of the entity."""
return self._state
def start_irrigation(self, station_id, duration):
"""
Start Irrigation command towards Rain Bird LNK WiFi stick.
@param call: should be a home assistant call object with data
station for Zone to sprinkle and duration for the time
"""
_LOGGER.info("Requesting irrigation for " +
str(station_id) + " duration " + str(duration))
result = self.controller.startIrrigation(
int(station_id), int(duration))
if result == 1:
_LOGGER.info("Irrigation started on " + str(station_id) +
" for " + str(duration))
elif result == 0:
_LOGGER.error("Error sending request")
else:
_LOGGER.error("Request was not acknowledged!")
def stop_irrigation(self):
"""Stop the irrigation (if one is running)."""
_LOGGER.info("Stop request irrigation")
result = self.controller.stopIrrigation()
if result == 1:
_LOGGER.info("Stopped irrigation")
elif result == 0:
_LOGGER.error("Error sending request")
else:
_LOGGER.error("Request was not acknowledged!")
def update(self):
"""
Get current active station.
@return: integer which station is active
"""
_LOGGER.info("Request irrigation state")
result = self.controller.currentIrrigation()
if result < 0:
_LOGGER.error("Error sending request")
return -1
self._state = result

View file

@ -686,7 +686,7 @@ pyowm==2.7.1
# homeassistant.components.qwikswitch
pyqwikswitch==0.4
# homeassistant.components.rainbird
# homeassistant.components.switch.rainbird
pyrainbird==0.0.9
# homeassistant.components.climate.sensibo