jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-24 21:57:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix import-before-install of xbee-helper dependency.

Browse Source
This commit is contained in:
Flyte 2016-01-28 13:44:37 +00:00
parent dda4f84150
commit 4045fb6862
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
homeassistant/components/zigbee.py
View File

@ -8,9 +8,6 @@ classes.
from binascii import unhexlify from binascii import unhexlify
import xbee_helper.const as xb_const
from xbee_helper import ZigBee
from homeassistant.core import JobPriority from homeassistant.core import JobPriority
from homeassistant.const import EVENT_HOMEASSISTANT_STOP from homeassistant.const import EVENT_HOMEASSISTANT_STOP
from homeassistant.helpers.entity import Entity, ToggleEntity from homeassistant.helpers.entity import Entity, ToggleEntity
@ -26,6 +23,11 @@ DEFAULT_DEVICE = "/dev/ttyUSB0"
DEFAULT_BAUD = 9600 DEFAULT_BAUD = 9600
DEFAULT_ADC_MAX_VOLTS = 1.2 DEFAULT_ADC_MAX_VOLTS = 1.2
# Copied from xbee_helper.const during setup()
GPIO_DIGITAL_OUTPUT_LOW = None
GPIO_DIGITAL_OUTPUT_HIGH = None
ADC_PERCENTAGE = None
DEVICE = None DEVICE = None
@ -35,9 +37,18 @@ def setup(hass, config):
class for it. class for it.
""" """
global DEVICE global DEVICE
global GPIO_DIGITAL_OUTPUT_LOW
global GPIO_DIGITAL_OUTPUT_HIGH
global ADC_PERCENTAGE
import xbee_helper.const as xb_const
from xbee_helper import ZigBee
from serial import Serial from serial import Serial
GPIO_DIGITAL_OUTPUT_LOW = xb_const.GPIO_DIGITAL_OUTPUT_LOW
GPIO_DIGITAL_OUTPUT_HIGH = xb_const.GPIO_DIGITAL_OUTPUT_HIGH
ADC_PERCENTAGE = xb_const.ADC_PERCENTAGE
usb_device = config[DOMAIN].get(CONF_DEVICE, DEFAULT_DEVICE) usb_device = config[DOMAIN].get(CONF_DEVICE, DEFAULT_DEVICE)
baud = int(config[DOMAIN].get(CONF_BAUD, DEFAULT_BAUD)) baud = int(config[DOMAIN].get(CONF_BAUD, DEFAULT_BAUD))
ser = Serial(usb_device, baud) ser = Serial(usb_device, baud)
@ -119,13 +130,13 @@ class ZigBeeDigitalPinConfig(ZigBeePinConfig):
""" """
if self._config.get("on_state", "").lower() == "low": if self._config.get("on_state", "").lower() == "low":
bool2state = { bool2state = {
True: xb_const.GPIO_DIGITAL_OUTPUT_LOW, True: GPIO_DIGITAL_OUTPUT_LOW,
False: xb_const.GPIO_DIGITAL_OUTPUT_HIGH False: GPIO_DIGITAL_OUTPUT_HIGH
} }
else: else:
bool2state = { bool2state = {
True: xb_const.GPIO_DIGITAL_OUTPUT_HIGH, True: GPIO_DIGITAL_OUTPUT_HIGH,
False: xb_const.GPIO_DIGITAL_OUTPUT_LOW False: GPIO_DIGITAL_OUTPUT_LOW
} }
state2bool = {v: k for k, v in bool2state.items()} state2bool = {v: k for k, v in bool2state.items()}
return bool2state, state2bool return bool2state, state2bool
@ -268,5 +279,5 @@ class ZigBeeAnalogIn(Entity):
self._config.pin, self._config.pin,
self._config.max_voltage, self._config.max_voltage,
self._config.address, self._config.address,
xb_const.ADC_PERCENTAGE) ADC_PERCENTAGE)
self.update_ha_state() self.update_ha_state()