Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for BLE device tracker (#3019) 

* Bug fix tracked devices
* Added scan_duration configuration parameter
pull/3126/head
Open Home Automation 2016-09-01 22:18:58 +02:00 committed by Johann Kellerman
parent d2dfe04ec9
commit 83f1272662
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
homeassistant/components/device_tracker/bluetooth_le_tracker.py
View File

@ -2,16 +2,19 @@
import logging import logging
from datetime import timedelta from datetime import timedelta
import voluptuous as vol
from homeassistant.helpers.event import track_point_in_utc_time from homeassistant.helpers.event import track_point_in_utc_time
from homeassistant.components.device_tracker import ( from homeassistant.components.device_tracker import (
YAML_DEVICES, YAML_DEVICES,
CONF_TRACK_NEW, CONF_TRACK_NEW,
CONF_SCAN_INTERVAL, CONF_SCAN_INTERVAL,
DEFAULT_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL,
PLATFORM_SCHEMA,
load_config, load_config,
) )
import homeassistant.util as util import homeassistant.util as util
import homeassistant.util.dt as dt_util import homeassistant.util.dt as dt_util
import homeassistant.helpers.config_validation as cv
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -19,6 +22,11 @@ REQUIREMENTS = ['gattlib==0.20150805']
BLE_PREFIX = 'BLE_' BLE_PREFIX = 'BLE_'
MIN_SEEN_NEW = 5 MIN_SEEN_NEW = 5
CONF_SCAN_DURATION = "scan_duration"
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_SCAN_DURATION, default=10): cv.positive_int
})
def setup_scanner(hass, config, see): def setup_scanner(hass, config, see):
@ -51,12 +59,13 @@ def setup_scanner(hass, config, see):
"""Discover Bluetooth LE devices.""" """Discover Bluetooth LE devices."""
_LOGGER.debug("Discovering Bluetooth LE devices") _LOGGER.debug("Discovering Bluetooth LE devices")
service = DiscoveryService() service = DiscoveryService()
devices = service.discover(10) devices = service.discover(duration)
_LOGGER.debug("Bluetooth LE devices discovered = %s", devices) _LOGGER.debug("Bluetooth LE devices discovered = %s", devices)
return devices return devices
yaml_path = hass.config.path(YAML_DEVICES) yaml_path = hass.config.path(YAML_DEVICES)
duration = config.get(CONF_SCAN_DURATION)
devs_to_track = [] devs_to_track = []
devs_donot_track = [] devs_donot_track = []
@ -65,11 +74,13 @@ def setup_scanner(hass, config, see):
# to 0 # to 0
for device in load_config(yaml_path, hass, 0): for device in load_config(yaml_path, hass, 0):
# check if device is a valid bluetooth device # check if device is a valid bluetooth device
if device.mac and device.mac[:3].upper() == BLE_PREFIX: if device.mac and device.mac[:4].upper() == BLE_PREFIX:
if device.track: if device.track:
devs_to_track.append(device.mac[3:]) _LOGGER.debug("Adding %s to BLE tracker", device.mac)
devs_to_track.append(device.mac[4:])
else: else:
devs_donot_track.append(device.mac[3:]) _LOGGER.debug("Adding %s to BLE do not track", device.mac)
devs_donot_track.append(device.mac[4:])
# if track new devices is true discover new devices # if track new devices is true discover new devices
# on every scan. # on every scan.
@ -96,7 +107,7 @@ def setup_scanner(hass, config, see):
if track_new: if track_new:
for address in devs: for address in devs:
if address not in devs_to_track and \ if address not in devs_to_track and \
address not in devs_donot_track: address not in devs_donot_track:
_LOGGER.info("Discovered Bluetooth LE device %s", address) _LOGGER.info("Discovered Bluetooth LE device %s", address)
see_device(address, devs[address], new_device=True) see_device(address, devs[address], new_device=True)