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

fix: Support different JointSpace API versions (#13084)

Browse Source
This commit is contained in:
Federico Zivolo 2018-03-12 20:33:04 +01:00 committed by Paulus Schoutsen
parent 676c94561b
commit 15d345c4ef
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
homeassistant/components/media_player/philips_js.py
View File

@ -15,11 +15,11 @@ from homeassistant.components.media_player import (
SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF, SUPPORT_TURN_ON, SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF, SUPPORT_TURN_ON,
SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_STEP, SUPPORT_PLAY, MediaPlayerDevice) SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_STEP, SUPPORT_PLAY, MediaPlayerDevice)
from homeassistant.const import ( from homeassistant.const import (
CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON, STATE_UNKNOWN) CONF_HOST, CONF_NAME, CONF_API_VERSION, STATE_OFF, STATE_ON, STATE_UNKNOWN)
from homeassistant.helpers.script import Script from homeassistant.helpers.script import Script
from homeassistant.util import Throttle from homeassistant.util import Throttle
REQUIREMENTS = ['ha-philipsjs==0.0.1'] REQUIREMENTS = ['ha-philipsjs==0.0.2']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -36,10 +36,12 @@ CONF_ON_ACTION = 'turn_on_action'
DEFAULT_DEVICE = 'default' DEFAULT_DEVICE = 'default'
DEFAULT_HOST = '127.0.0.1' DEFAULT_HOST = '127.0.0.1'
DEFAULT_NAME = 'Philips TV' DEFAULT_NAME = 'Philips TV'
DEFAULT_API_VERSION = '1'
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Required(CONF_HOST, default=DEFAULT_HOST): cv.string, vol.Required(CONF_HOST, default=DEFAULT_HOST): cv.string,
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Optional(CONF_API_VERSION, default=DEFAULT_API_VERSION): cv.string,
vol.Optional(CONF_ON_ACTION): cv.SCRIPT_SCHEMA, vol.Optional(CONF_ON_ACTION): cv.SCRIPT_SCHEMA,
}) })
@ -51,9 +53,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
name = config.get(CONF_NAME) name = config.get(CONF_NAME)
host = config.get(CONF_HOST) host = config.get(CONF_HOST)
api_version = config.get(CONF_API_VERSION)
turn_on_action = config.get(CONF_ON_ACTION) turn_on_action = config.get(CONF_ON_ACTION)
tvapi = haphilipsjs.PhilipsTV(host) tvapi = haphilipsjs.PhilipsTV(host, api_version)
on_script = Script(hass, turn_on_action) if turn_on_action else None on_script = Script(hass, turn_on_action) if turn_on_action else None
add_devices([PhilipsTV(tvapi, name, on_script)]) add_devices([PhilipsTV(tvapi, name, on_script)])

1
homeassistant/const.py
View File

@ -27,6 +27,7 @@ CONF_ADDRESS = 'address'
CONF_AFTER = 'after' CONF_AFTER = 'after'
CONF_ALIAS = 'alias' CONF_ALIAS = 'alias'
CONF_API_KEY = 'api_key' CONF_API_KEY = 'api_key'
CONF_API_VERSION = 'api_version'
CONF_AT = 'at' CONF_AT = 'at'
CONF_AUTHENTICATION = 'authentication' CONF_AUTHENTICATION = 'authentication'
CONF_BASE = 'base' CONF_BASE = 'base'

2
requirements_all.txt
View File

@ -332,7 +332,7 @@ gstreamer-player==1.1.0
ha-ffmpeg==1.9 ha-ffmpeg==1.9
# homeassistant.components.media_player.philips_js # homeassistant.components.media_player.philips_js
ha-philipsjs==0.0.1 ha-philipsjs==0.0.2
# homeassistant.components.sensor.geo_rss_events # homeassistant.components.sensor.geo_rss_events
haversine==0.4.5 haversine==0.4.5