evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Extract mqtt string into constant and add log

Browse source
This commit is contained in:
MartinHjelmare 2016-08-25 19:07:22 +02:00
parent e7b206da0c
commit d1e94b958f
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
homeassistant/components/mysensors.py
View file

@ -31,6 +31,7 @@ DEFAULT_TCP_PORT = 5003
DOMAIN = 'mysensors' DOMAIN = 'mysensors'
DEPENDENCIES = [] DEPENDENCIES = []
MQTT_COMPONENT = 'mqtt'
REQUIREMENTS = [ REQUIREMENTS = [
'https://github.com/theolind/pymysensors/archive/' 'https://github.com/theolind/pymysensors/archive/'
'8ce98b7fb56f7921a808eb66845ce8b2c455c81e.zip#pymysensors==0.7.1'] '8ce98b7fb56f7921a808eb66845ce8b2c455c81e.zip#pymysensors==0.7.1']
@ -64,10 +65,10 @@ def setup(hass, config): # pylint: disable=too-many-locals
out_prefix): out_prefix):
"""Return gateway after setup of the gateway.""" """Return gateway after setup of the gateway."""
# pylint: disable=too-many-arguments # pylint: disable=too-many-arguments
if device in 'mqtt': if device == MQTT_COMPONENT:
if not setup_component(hass, 'mqtt', config): if not setup_component(hass, MQTT_COMPONENT, config):
return return
mqtt = get_component('mqtt') mqtt = get_component(MQTT_COMPONENT)
retain = config[DOMAIN].get(CONF_RETAIN, True) retain = config[DOMAIN].get(CONF_RETAIN, True)
def pub_callback(topic, payload, qos, retain): def pub_callback(topic, payload, qos, retain):
@ -139,6 +140,11 @@ def setup(hass, config): # pylint: disable=too-many-locals
if GATEWAYS[device] is None: if GATEWAYS[device] is None:
GATEWAYS.pop(device) GATEWAYS.pop(device)
if not GATEWAYS:
_LOGGER.error(
'No devices could be setup as gateways, check your configuration')
return False
for component in 'sensor', 'switch', 'light', 'binary_sensor': for component in 'sensor', 'switch', 'light', 'binary_sensor':
discovery.load_platform(hass, component, DOMAIN, {}, config) discovery.load_platform(hass, component, DOMAIN, {}, config)
@ -228,7 +234,7 @@ class GatewayWrapper(object):
"""Return a new callback function.""" """Return a new callback function."""
def node_update(update_type, node_id): def node_update(update_type, node_id):
"""Callback for node updates from the MySensors gateway.""" """Callback for node updates from the MySensors gateway."""
_LOGGER.debug('update %s: node %s', update_type, node_id) _LOGGER.debug('Update %s: node %s', update_type, node_id)
for callback in self.platform_callbacks: for callback in self.platform_callbacks:
callback(self, node_id) callback(self, node_id)
@ -299,7 +305,7 @@ class MySensorsDeviceEntity(object):
try: try:
attr[set_req(value_type).name] = value attr[set_req(value_type).name] = value
except ValueError: except ValueError:
_LOGGER.error('value_type %s is not valid for mysensors ' _LOGGER.error('Value_type %s is not valid for mysensors '
'version %s', value_type, 'version %s', value_type,
self.gateway.version) self.gateway.version)
return attr return attr