Skip to content
Permalink
Browse files

Merge branch 'dev' into current

* dev: (53 commits)
  Update requests to 2.22.0 (home-assistant#23958)
  Setup integration dependencies before loading it (home-assistant#23957)
  Add unit of measurement to Tautulli sensor (home-assistant#23873)
  Bump pytraccar (home-assistant#23939)
  Added support for sensor other than temperature and humidity (home-assistant#23863)
  Fix auto version update Hass.io (home-assistant#23935)
  Fix fan rates for Daikin (home-assistant#23860)
  Fix for non existing Daikin zones (home-assistant#23792)
  Have homekit_controller use device registry (home-assistant#23874)
  Fix problem with cameras that don't support time (home-assistant#23924)
  Fix additional IQVIA data bug (home-assistant#23931)
  Fix icons for homekit_controller sensors (home-assistant#23921)
  Fix bug when IQVIA API fails to return data (home-assistant#23916)
  Switch media player to SWITCH type (home-assistant#23914)
  Version bump insteonplm to 0.15.4 (home-assistant#23918)
  Add @Kane610 to zeroconf CODEOWNERS
  Update Honeywell warning (home-assistant#23913)
  [WIP] Simplify zeroconf (home-assistant#23890)
  Netatmo, handle offline device (home-assistant#23907)
  Load HA core config from storage (home-assistant#23872)
  ...
  • Loading branch information...
mxworm committed May 18, 2019
2 parents 1808beb + c483e44 commit 096055cca68b5290def18312a231df8a6f85ade5
Showing with 1,540 additions and 1,058 deletions.
  1. +1 −1 CODEOWNERS
  2. +3 −2 azure-pipelines.yml
  3. +11 −5 homeassistant/components/bluetooth_le_tracker/device_tracker.py
  4. +14 −6 homeassistant/components/bluetooth_tracker/device_tracker.py
  5. +2 −2 homeassistant/components/daikin/climate.py
  6. +1 −1 homeassistant/components/daikin/manifest.json
  7. +1 −2 homeassistant/components/daikin/switch.py
  8. +71 −648 homeassistant/components/device_tracker/__init__.py
  9. +40 −0 homeassistant/components/device_tracker/const.py
  10. +528 −0 homeassistant/components/device_tracker/legacy.py
  11. +199 −0 homeassistant/components/device_tracker/setup.py
  12. +1 −2 homeassistant/components/google_assistant/const.py
  13. +39 −0 homeassistant/components/homekit_controller/__init__.py
  14. +66 −15 homeassistant/components/homekit_controller/config_flow.py
  15. +10 −0 homeassistant/components/homekit_controller/connection.py
  16. +3 −3 homeassistant/components/homekit_controller/sensor.py
  17. +16 −0 homeassistant/components/homematicip_cloud/climate.py
  18. +1 −2 homeassistant/components/honeywell/climate.py
  19. +4 −2 homeassistant/components/icloud/device_tracker.py
  20. +1 −1 homeassistant/components/insteon/manifest.json
  21. +3 −11 homeassistant/components/iqvia/__init__.py
  22. +3 −4 homeassistant/components/iqvia/config_flow.py
  23. +1 −1 homeassistant/components/iqvia/manifest.json
  24. +1 −1 homeassistant/components/iqvia/sensor.py
  25. +10 −6 homeassistant/components/netatmo/sensor.py
  26. +1 −1 homeassistant/components/netgear/manifest.json
  27. +22 −21 homeassistant/components/onvif/camera.py
  28. +4 −3 homeassistant/components/ping/device_tracker.py
  29. +0 −1 homeassistant/components/ps4/__init__.py
  30. +27 −12 homeassistant/components/spaceapi/__init__.py
  31. +5 −0 homeassistant/components/tautulli/sensor.py
  32. +1 −1 homeassistant/components/traccar/manifest.json
  33. +4 −16 homeassistant/components/zeroconf/__init__.py
  34. +2 −1 homeassistant/components/zeroconf/manifest.json
  35. +81 −17 homeassistant/config.py
  36. +4 −1 homeassistant/core.py
  37. +1 −1 homeassistant/package_constraints.txt
  38. +6 −6 homeassistant/scripts/check_config.py
  39. +6 −6 requirements_all.txt
  40. +1 −1 requirements_test_all.txt
  41. +1 −1 setup.py
  42. +3 −2 tests/components/demo/test_init.py
  43. +4 −2 tests/components/device_sun_light_trigger/test_init.py
  44. +57 −56 tests/components/device_tracker/test_init.py
  45. +1 −1 tests/components/geofency/test_init.py
  46. +4 −4 tests/components/google_assistant/__init__.py
  47. +1 −1 tests/components/google_assistant/test_smart_home.py
  48. +1 −1 tests/components/gpslogger/test_init.py
  49. +13 −0 tests/components/homekit_controller/specific_devices/test_aqara_gateway.py
  50. +18 −0 tests/components/homekit_controller/specific_devices/test_ecobee3.py
  51. +9 −0 tests/components/homekit_controller/specific_devices/test_koogeek_ls1.py
  52. +12 −0 tests/components/homekit_controller/specific_devices/test_lennox_e30.py
  53. +121 −141 tests/components/homekit_controller/test_config_flow.py
  54. +2 −13 tests/components/iqvia/test_config_flow.py
  55. +1 −1 tests/components/locative/test_init.py
  56. +6 −5 tests/components/mqtt/test_device_tracker.py
  57. +22 −21 tests/components/mqtt_json/test_device_tracker.py
  58. +2 −2 tests/components/tplink/test_device_tracker.py
  59. +2 −2 tests/components/unifi_direct/test_device_tracker.py
  60. +2 −2 tests/conftest.py
  61. +62 −0 tests/test_config.py
  62. +1 −0 tests/test_core.py
@@ -269,7 +269,7 @@ homeassistant/components/yeelight/* @rytilahti @zewelor
homeassistant/components/yeelightsunflower/* @lindsaymarkward
homeassistant/components/yessssms/* @flowolf
homeassistant/components/yi/* @bachya
homeassistant/components/zeroconf/* @robbiet480
homeassistant/components/zeroconf/* @robbiet480 @Kane610
homeassistant/components/zha/* @dmulcahey @adminiuga
homeassistant/components/zone/* @home-assistant/core
homeassistant/components/zoneminder/* @rohankapoorcom
@@ -40,10 +40,11 @@ jobs:
buildArch: 'aarch64'
steps:
- script: |
sudo apt-get update
sudo apt-get install -y --no-install-recommends \
qemu-user-static \
binfmt-support
sudo mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
sudo update-binfmts --enable qemu-arm
sudo update-binfmts --enable qemu-aarch64
@@ -159,7 +160,7 @@ jobs:
git config --global user.email "pvizeli@syshack.ch"
git config --global credential.helper store
echo "https://$(githubToken):x-oauth-basic@github.com > $HOME\.git-credentials
echo "https://$(githubToken):x-oauth-basic@github.com" > $HOME/.git-credentials
displayName: 'Install requirements'
- script: |
set -e
@@ -2,12 +2,15 @@
import logging

from homeassistant.helpers.event import track_point_in_utc_time
from homeassistant.components.device_tracker import (
YAML_DEVICES, CONF_TRACK_NEW, CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL,
load_config, SOURCE_TYPE_BLUETOOTH_LE
from homeassistant.components.device_tracker.legacy import (
YAML_DEVICES, async_load_config
)
from homeassistant.components.device_tracker.const import (
CONF_TRACK_NEW, CONF_SCAN_INTERVAL, SCAN_INTERVAL, SOURCE_TYPE_BLUETOOTH_LE
)
from homeassistant.const import EVENT_HOMEASSISTANT_STOP
import homeassistant.util.dt as dt_util
from homeassistant.util.async_ import run_coroutine_threadsafe

_LOGGER = logging.getLogger(__name__)

@@ -79,7 +82,10 @@ def discover_ble_devices():
# Load all known devices.
# We just need the devices so set consider_home and home range
# to 0
for device in load_config(yaml_path, hass, 0):
for device in run_coroutine_threadsafe(
async_load_config(yaml_path, hass, 0),
hass.loop
).result():
# check if device is a valid bluetooth device
if device.mac and device.mac[:4].upper() == BLE_PREFIX:
if device.track:
@@ -97,7 +103,7 @@ def discover_ble_devices():
_LOGGER.warning("No Bluetooth LE devices to track!")
return False

interval = config.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL)
interval = config.get(CONF_SCAN_INTERVAL, SCAN_INTERVAL)

def update_ble(now):
"""Lookup Bluetooth LE devices and update status."""
@@ -5,11 +5,16 @@

import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.event import track_point_in_utc_time
from homeassistant.components.device_tracker import (
YAML_DEVICES, CONF_TRACK_NEW, CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL,
load_config, PLATFORM_SCHEMA, DEFAULT_TRACK_NEW, SOURCE_TYPE_BLUETOOTH,
DOMAIN)
from homeassistant.components.device_tracker import PLATFORM_SCHEMA
from homeassistant.components.device_tracker.legacy import (
YAML_DEVICES, async_load_config
)
from homeassistant.components.device_tracker.const import (
CONF_TRACK_NEW, CONF_SCAN_INTERVAL, SCAN_INTERVAL, DEFAULT_TRACK_NEW,
SOURCE_TYPE_BLUETOOTH, DOMAIN
)
import homeassistant.util.dt as dt_util
from homeassistant.util.async_ import run_coroutine_threadsafe

_LOGGER = logging.getLogger(__name__)

@@ -60,7 +65,10 @@ def discover_devices():
# Load all known devices.
# We just need the devices so set consider_home and home range
# to 0
for device in load_config(yaml_path, hass, 0):
for device in run_coroutine_threadsafe(
async_load_config(yaml_path, hass, 0),
hass.loop
).result():
# Check if device is a valid bluetooth device
if device.mac and device.mac[:3].upper() == BT_PREFIX:
if device.track:
@@ -77,7 +85,7 @@ def discover_devices():
devs_to_track.append(dev[0])
see_device(dev[0], dev[1])

interval = config.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL)
interval = config.get(CONF_SCAN_INTERVAL, SCAN_INTERVAL)

request_rssi = config.get(CONF_REQUEST_RSSI, False)

@@ -81,7 +81,7 @@ def __init__(self, api):
self._api = api
self._list = {
ATTR_OPERATION_MODE: list(HA_STATE_TO_DAIKIN),
ATTR_FAN_MODE: self._api.device.fan_modes,
ATTR_FAN_MODE: self._api.device.fan_rate,
ATTR_SWING_MODE: list(
map(
str.title,
@@ -97,7 +97,7 @@ def __init__(self, api):
if self._api.device.support_away_mode:
self._supported_features |= SUPPORT_AWAY_MODE

if self._api.device.support_fan_mode:
if self._api.device.support_fan_rate:
self._supported_features |= SUPPORT_FAN_MODE

if self._api.device.support_swing_mode:
@@ -4,7 +4,7 @@
"config_flow": true,
"documentation": "https://www.home-assistant.io/components/daikin",
"requirements": [
"pydaikin==1.4.3"
"pydaikin==1.4.4"
],
"dependencies": [],
"codeowners": [
@@ -27,8 +27,7 @@
if zones:
async_add_entities([
DaikinZoneSwitch(daikin_api, zone_id)
for zone_id, name in enumerate(zones)
if name != '-'
for zone_id, zone in enumerate(zones) if zone != ('-', 0)
])


0 comments on commit 096055c

Please sign in to comment.
You can’t perform that action at this time.